Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 82cbffd0365495cd7a87fbef95c7d7280823291a..9892827b6176ca5f75f250807ef5e88903f7d1a7 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,12 +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
        select HAVE_KPROBES
 mainmenu "Linux Kernel Configuration"
 
 config S390
        def_bool y
        select HAVE_OPROFILE
        select HAVE_KPROBES

+       select HAVE_KRETPROBES

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


@@ -92,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