Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4ec716d8c1a623b4e123b8e2923d4443a3f3b42a..b21444b681b667b526ddbebcca337e24d6b48581 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,10 +50,17 @@ 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
 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y

+       select HAVE_OPROFILE
+       select HAVE_KPROBES

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


@@ -81,8 +91,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.
 


@@ -90,7 +100,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


@@ -276,9 +287,6 @@ source "kernel/Kconfig.preempt"
 
 source "mm/Kconfig"
 
 
 source "mm/Kconfig"
 

-config HOLES_IN_ZONE
-       def_bool y
-

 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING
 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING


@@ -513,7 +521,7 @@ config ZFCPDUMP
        default n
        help
          Select this option if you want to build an zfcpdump enabled kernel.
        default n
        help
          Select this option if you want to build an zfcpdump enabled kernel.

-         Refer to "Documentation/s390/zfcpdump.txt" for more details on this.
+         Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.

 
 endmenu
 
 
 endmenu
 


@@ -529,8 +537,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"