diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-09-06 04:03:30 -0400 |
---|---|---|
committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-09-07 05:57:52 -0400 |
commit | 93bead4369c0a9e41327f2f7eb19d3c767f271c6 (patch) | |
tree | 3cf118c3f7a8ccbc74ec1bf9cf66fbc189de4627 /arch/s390/Kconfig | |
parent | 82003c3e606905ca20c78a0ceca9f412e6f71474 (diff) |
s390: keep Kconfig sorted
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 8b7892bf6d8b..665c8a203651 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -62,6 +62,7 @@ config S390 | |||
62 | def_bool y | 62 | def_bool y |
63 | select ARCH_DISCARD_MEMBLOCK | 63 | select ARCH_DISCARD_MEMBLOCK |
64 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 64 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
65 | select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | ||
65 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 66 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
66 | select ARCH_INLINE_READ_LOCK | 67 | select ARCH_INLINE_READ_LOCK |
67 | select ARCH_INLINE_READ_LOCK_BH | 68 | select ARCH_INLINE_READ_LOCK_BH |
@@ -91,7 +92,6 @@ config S390 | |||
91 | select ARCH_INLINE_WRITE_UNLOCK_BH | 92 | select ARCH_INLINE_WRITE_UNLOCK_BH |
92 | select ARCH_INLINE_WRITE_UNLOCK_IRQ | 93 | select ARCH_INLINE_WRITE_UNLOCK_IRQ |
93 | select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE | 94 | select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE |
94 | select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | ||
95 | select ARCH_SAVE_PAGE_KEYS if HIBERNATION | 95 | select ARCH_SAVE_PAGE_KEYS if HIBERNATION |
96 | select ARCH_WANT_IPC_PARSE_VERSION | 96 | select ARCH_WANT_IPC_PARSE_VERSION |
97 | select BUILDTIME_EXTABLE_SORT | 97 | select BUILDTIME_EXTABLE_SORT |
@@ -135,15 +135,15 @@ config S390 | |||
135 | select HAVE_SYSCALL_TRACEPOINTS | 135 | select HAVE_SYSCALL_TRACEPOINTS |
136 | select HAVE_UID16 if 32BIT | 136 | select HAVE_UID16 if 32BIT |
137 | select HAVE_VIRT_CPU_ACCOUNTING | 137 | select HAVE_VIRT_CPU_ACCOUNTING |
138 | select VIRT_TO_BUS | ||
139 | select INIT_ALL_POSSIBLE | 138 | select INIT_ALL_POSSIBLE |
140 | select KTIME_SCALAR if 32BIT | 139 | select KTIME_SCALAR if 32BIT |
141 | select MODULES_USE_ELF_RELA | 140 | select MODULES_USE_ELF_RELA |
142 | select OLD_SIGSUSPEND3 | ||
143 | select OLD_SIGACTION | 141 | select OLD_SIGACTION |
142 | select OLD_SIGSUSPEND3 | ||
144 | select SYSCTL_EXCEPTION_TRACE | 143 | select SYSCTL_EXCEPTION_TRACE |
145 | select USE_GENERIC_SMP_HELPERS if SMP | 144 | select USE_GENERIC_SMP_HELPERS if SMP |
146 | select VIRT_CPU_ACCOUNTING | 145 | select VIRT_CPU_ACCOUNTING |
146 | select VIRT_TO_BUS | ||
147 | 147 | ||
148 | config SCHED_OMIT_FRAME_POINTER | 148 | config SCHED_OMIT_FRAME_POINTER |
149 | def_bool y | 149 | def_bool y |