Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 373679b3744a7992c7009281c1747b3aeb38157a..d1727584230a66b504ae1e9e0beed8f3522c5b23 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -87,11 +87,13 @@ config S390
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_XZ
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_XZ

-       select HAVE_GET_USER_PAGES_FAST

        select HAVE_ARCH_MUTEX_CPU_RELAX
        select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
        select HAVE_RCU_TABLE_FREE if SMP
        select ARCH_SAVE_PAGE_KEYS if HIBERNATION
        select HAVE_ARCH_MUTEX_CPU_RELAX
        select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
        select HAVE_RCU_TABLE_FREE if SMP
        select ARCH_SAVE_PAGE_KEYS if HIBERNATION

+       select HAVE_MEMBLOCK
+       select HAVE_MEMBLOCK_NODE_MAP
+       select ARCH_DISCARD_MEMBLOCK

        select ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
        select ARCH_INLINE_SPIN_LOCK
        select ARCH_INLINE_SPIN_TRYLOCK
        select ARCH_INLINE_SPIN_TRYLOCK_BH
        select ARCH_INLINE_SPIN_LOCK


@@ -191,18 +193,13 @@ config HOTPLUG_CPU
          Say N if you want to disable CPU hotplug.
 
 config SCHED_MC
          Say N if you want to disable CPU hotplug.
 
 config SCHED_MC

-       def_bool y
-       prompt "Multi-core scheduler support"
-       depends on SMP
-       help
-         Multi-core scheduler support improves the CPU scheduler's decision
-         making when dealing with multi-core CPU chips at a cost of slightly
-         increased overhead in some places.
+       def_bool n

 
 config SCHED_BOOK
        def_bool y
        prompt "Book scheduler support"
 
 config SCHED_BOOK
        def_bool y
        prompt "Book scheduler support"

-       depends on SMP && SCHED_MC
+       depends on SMP
+       select SCHED_MC

        help
          Book scheduler support improves the CPU scheduler's decision making
          when dealing with machines that have several books.
        help
          Book scheduler support improves the CPU scheduler's decision making
          when dealing with machines that have several books.


@@ -345,9 +342,6 @@ config WARN_DYNAMIC_STACK
 
          Say N if you are unsure.
 
 
          Say N if you are unsure.
 

-config ARCH_POPULATES_NODE_MAP
-       def_bool y
-

 comment "Kernel preemption"
 
 source "kernel/Kconfig.preempt"
 comment "Kernel preemption"
 
 source "kernel/Kconfig.preempt"