summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-08-11 17:52:00 -0700
committerDavid S. Miller <davem@davemloft.net>2018-08-11 17:52:00 -0700
commit6a92ef08a1351e4977d6acde2196fa94e9c3a660 (patch)
tree3f237980c08af76beae04a6844ad254543ca4b9f /arch/s390
parent9a95d9c6429bb58905fdfc95da2e1b7cc3fb55b7 (diff)
parentec0c96714e7ddeda4eccaa077f5646a0fd6e371f (diff)
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 8a1863d9ed53..4fe5b2affa23 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -106,7 +106,6 @@ config S390
select ARCH_USE_BUILTIN_BSWAP
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_WANTS_DYNAMIC_TASK_STRUCT
- select ARCH_WANTS_UBSAN_NO_NULL
select ARCH_WANT_IPC_PARSE_VERSION
select BUILDTIME_EXTABLE_SORT
select CLONE_BACKWARDS2