Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index e16390c0bca80d356a6fdfb7b5aac57a10fc664e..a39b4690c171621e78e2183c6b1b97bd25f4afaf 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,6 +87,7 @@ 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 ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
@@ -123,6 +118,9 @@ config S390
        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
@@ -135,8 +133,6 @@ menu "Base setup"
 
 comment "Processor type and features"
 
-source "kernel/time/Kconfig"
-
 config 64BIT
        def_bool y
        prompt "64 bit kernel"
@@ -147,9 +143,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"