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

[linux-2.6-omap-h63xx.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c561f6fc3d7538fd9b9994e0cd8599fe988fc92b..1831833c430edc8d17015c739e9262b46bc88e77 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -16,6 +16,9 @@ config LOCKDEP_SUPPORT
 config STACKTRACE_SUPPORT
        def_bool y
 
 config STACKTRACE_SUPPORT
        def_bool y
 

+config HAVE_LATENCYTOP_SUPPORT
+       def_bool y
+

 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        bool
 


@@ -47,11 +50,18 @@ config NO_IOMEM
 config NO_DMA
        def_bool y
 
 config NO_DMA
        def_bool y
 

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y
        select HAVE_OPROFILE
 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y
        select HAVE_OPROFILE

+       select HAVE_KPROBES
+       select HAVE_KRETPROBES

 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 


@@ -82,8 +92,8 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 

-         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.

 
          Even if you don't know what to do here, say Y.
 
 
          Even if you don't know what to do here, say Y.
 


@@ -91,7 +101,8 @@ config NR_CPUS
        int "Maximum number of CPUs (2-64)"
        range 2 64
        depends on SMP
        int "Maximum number of CPUs (2-64)"
        range 2 64
        depends on SMP

-       default "32"
+       default "32" if !64BIT
+       default "64" if 64BIT

        help
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  The maximum supported value is 64 and the
        help
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  The maximum supported value is 64 and the


@@ -340,6 +351,10 @@ endchoice
 
 source "fs/Kconfig.binfmt"
 
 
 source "fs/Kconfig.binfmt"
 

+config FORCE_MAX_ZONEORDER
+       int
+       default "9"
+

 config PROCESS_DEBUG
        bool "Show crashed user process info"
        help
 config PROCESS_DEBUG
        bool "Show crashed user process info"
        help


@@ -527,8 +542,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/s390/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/s390/Kconfig.debug"
 
 source "security/Kconfig"