s390/exceptions: sort exception table at build time

[~andy/linux] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 9015060919a0430cd5b8233081f2e12f4c3e2547..d6108593c099bf57c7efa8ce0bee49937b744d98 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -28,12 +28,6 @@ config ARCH_HAS_ILOG2_U64
 config GENERIC_HWEIGHT
        def_bool y
 
-config GENERIC_TIME_VSYSCALL
-       def_bool y
-
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
 config GENERIC_BUG
        def_bool y if BUG
 
@@ -93,7 +87,9 @@ config S390
        select ARCH_SAVE_PAGE_KEYS if HIBERNATION
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
+       select HAVE_CMPXCHG_LOCAL
        select ARCH_DISCARD_MEMBLOCK
+       select BUILDTIME_EXTABLE_SORT
        select ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
        select ARCH_INLINE_SPIN_LOCK
@@ -122,6 +118,10 @@ config S390
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
+       select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_TIME_VSYSCALL
+       select GENERIC_CLOCKEVENTS
+       select KTIME_SCALAR if 32BIT
 
 config SCHED_OMIT_FRAME_POINTER
        def_bool y
@@ -134,8 +134,6 @@ menu "Base setup"
 
 comment "Processor type and features"
 
-source "kernel/time/Kconfig"
-
 config 64BIT
        def_bool y
        prompt "64 bit kernel"
@@ -146,9 +144,6 @@ config 64BIT
 config 32BIT
        def_bool y if !64BIT
 
-config KTIME_SCALAR
-       def_bool 32BIT
-
 config SMP
        def_bool y
        prompt "Symmetric multi-processing support"
@@ -217,7 +212,7 @@ config COMPAT
        def_bool y
        prompt "Kernel support for 31 bit emulation"
        depends on 64BIT
-       select COMPAT_BINFMT_ELF
+       select COMPAT_BINFMT_ELF if BINFMT_ELF
        select ARCH_WANT_OLD_COMPAT_IPC
        help
          Select this option if you want to enable your system kernel to
@@ -234,6 +229,25 @@ config KEYS_COMPAT
 config AUDIT_ARCH
        def_bool y
 
+config HAVE_MARCH_Z900_FEATURES
+       def_bool n
+
+config HAVE_MARCH_Z990_FEATURES
+       def_bool n
+       select HAVE_MARCH_Z900_FEATURES
+
+config HAVE_MARCH_Z9_109_FEATURES
+       def_bool n
+       select HAVE_MARCH_Z990_FEATURES
+
+config HAVE_MARCH_Z10_FEATURES
+       def_bool n
+       select HAVE_MARCH_Z9_109_FEATURES
+
+config HAVE_MARCH_Z196_FEATURES
+       def_bool n
+       select HAVE_MARCH_Z10_FEATURES
+
 comment "Code generation options"
 
 choice
@@ -249,6 +263,7 @@ config MARCH_G5
 
 config MARCH_Z900
        bool "IBM zSeries model z800 and z900"
+       select HAVE_MARCH_Z900_FEATURES if 64BIT
        help
          Select this to enable optimizations for model z800/z900 (2064 and
          2066 series). This will enable some optimizations that are not
@@ -256,6 +271,7 @@ config MARCH_Z900
 
 config MARCH_Z990
        bool "IBM zSeries model z890 and z990"
+       select HAVE_MARCH_Z990_FEATURES if 64BIT
        help
          Select this to enable optimizations for model z890/z990 (2084 and
          2086 series). The kernel will be slightly faster but will not work
@@ -263,6 +279,7 @@ config MARCH_Z990
 
 config MARCH_Z9_109
        bool "IBM System z9"
+       select HAVE_MARCH_Z9_109_FEATURES if 64BIT
        help
          Select this to enable optimizations for IBM System z9 (2094 and
          2096 series). The kernel will be slightly faster but will not work
@@ -270,6 +287,7 @@ config MARCH_Z9_109
 
 config MARCH_Z10
        bool "IBM System z10"
+       select HAVE_MARCH_Z10_FEATURES if 64BIT
        help
          Select this to enable optimizations for IBM System z10 (2097 and
          2098 series). The kernel will be slightly faster but will not work
@@ -277,6 +295,7 @@ config MARCH_Z10
 
 config MARCH_Z196
        bool "IBM zEnterprise 114 and 196"
+       select HAVE_MARCH_Z196_FEATURES if 64BIT
        help
          Select this to enable optimizations for IBM zEnterprise 114 and 196
          (2818 and 2817 series). The kernel will be slightly faster but will
@@ -406,33 +425,6 @@ config CHSC_SCH
 
 comment "Misc"
 
-config IPL
-       def_bool y
-       prompt "Builtin IPL record support"
-       help
-         If you want to use the produced kernel to IPL directly from a
-         device, you have to merge a bootsector specific to the device
-         into the first bytes of the kernel. You will have to select the
-         IPL device.
-
-choice
-       prompt "IPL method generated into head.S"
-       depends on IPL
-       default IPL_VM
-       help
-         Select "tape" if you want to IPL the image from a Tape.
-
-         Select "vm_reader" if you are running under VM/ESA and want
-         to IPL the image from the emulated card reader.
-
-config IPL_TAPE
-       bool "tape"
-
-config IPL_VM
-       bool "vm_reader"
-
-endchoice
-
 source "fs/Kconfig.binfmt"
 
 config FORCE_MAX_ZONEORDER
@@ -569,7 +561,7 @@ config KEXEC
 
 config CRASH_DUMP
        bool "kernel crash dumps"
-       depends on 64BIT
+       depends on 64BIT && SMP
        select KEXEC
        help
          Generate crash dump after being started by kexec.