Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 2f4f70c4dbb293caf433de6ee3f3f15202278f73..583d9ff0a571a4c75a1370472e9c03ff7333a076 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -30,8 +30,8 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

-config GENERIC_BUST_SPINLOCK
-       bool
+config GENERIC_TIME
+       def_bool y

 
 mainmenu "Linux Kernel Configuration"
 
 
 mainmenu "Linux Kernel Configuration"
 


@@ -51,6 +51,10 @@ config 64BIT
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 

+config 32BIT
+       bool
+       default y if !64BIT
+

 config SMP
        bool "Symmetric multi-processing support"
        ---help---
 config SMP
        bool "Symmetric multi-processing support"
        ---help---


@@ -149,6 +153,14 @@ config MARCH_Z990
          This will be slightly faster but does not work on
          older machines such as the z900.
 
          This will be slightly faster but does not work on
          older machines such as the z900.
 

+config MARCH_Z9_109
+       bool "IBM System z9"
+       help
+         Select this to enable optimizations for IBM System z9-109, IBM
+         System z9 Enterprise Class (z9 EC), and IBM System z9 Business
+         Class (z9 BC). The kernel will be slightly faster but will not
+         work on older machines such as the z990, z890, z900, and z800.
+

 endchoice
 
 config PACK_STACK
 endchoice
 
 config PACK_STACK


@@ -166,7 +178,7 @@ config PACK_STACK
 
 config SMALL_STACK
        bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
 
 config SMALL_STACK
        bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"

-       depends on PACK_STACK
+       depends on PACK_STACK && !LOCKDEP

        help
          If you say Y here and the compiler supports the -mkernel-backchain
          option the kernel will use a smaller kernel stack size. For 31 bit
        help
          If you say Y here and the compiler supports the -mkernel-backchain
          option the kernel will use a smaller kernel stack size. For 31 bit


@@ -460,8 +472,7 @@ config S390_HYPFS_FS
          information in an s390 hypervisor environment.
 
 config KEXEC
          information in an s390 hypervisor environment.
 
 config KEXEC

-       bool "kexec system call (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "kexec system call"

        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot


@@ -487,8 +498,22 @@ source "drivers/net/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

+menu "Instrumentation Support"
+

 source "arch/s390/oprofile/Kconfig"
 
 source "arch/s390/oprofile/Kconfig"
 

+config KPROBES
+       bool "Kprobes (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && MODULES
+       help
+         Kprobes allows you to trap at almost any kernel address and
+         execute a callback function.  register_kprobe() establishes
+         a probepoint and specifies the callback.  Kprobes is useful
+         for kernel debugging, non-intrusive instrumentation and testing.
+         If in doubt, say "N".
+
+endmenu
+

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