fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 13dbfd3..c94462d 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,6 +7,14 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       default y
+

 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        bool
 


@@ -14,12 +22,24 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
        bool
        default y
 

-config GENERIC_CALIBRATE_DELAY
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
+config GENERIC_HWEIGHT

        bool
        default y
 
        bool
        default y
 

-config GENERIC_BUST_SPINLOCK
+config GENERIC_CALIBRATE_DELAY

        bool
        bool

+       default y
+
+config GENERIC_TIME
+       def_bool y

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


@@ -39,6 +59,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---


@@ -106,12 +130,9 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
        depends on COMPAT && SYSVIPC
        default y
 

-config BINFMT_ELF32
-       tristate "Kernel support for 31 bit ELF binaries"
-       depends on COMPAT
-       help
-         This allows you to run 32-bit Linux/ELF binaries on your zSeries
-         in 64 bit mode. Everybody wants this; say Y.
+config AUDIT_ARCH
+       bool
+       default y

 
 comment "Code generation options"
 
 
 comment "Code generation options"
 


@@ -140,6 +161,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


@@ -157,7 +186,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


@@ -212,8 +241,14 @@ config WARN_STACK_SIZE
          This allows you to specify the maximum frame size a function may
          have without the compiler complaining about it.
 
          This allows you to specify the maximum frame size a function may
          have without the compiler complaining about it.
 

+config ARCH_POPULATES_NODE_MAP
+       def_bool y
+

 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


@@ -237,14 +272,6 @@ config QDIO
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

-config QDIO_PERF_STATS
-       bool "Performance statistics in /proc"
-       depends on QDIO
-       help
-         Say Y here to get performance statistics in /proc/qdio_perf
-
-         If unsure, say N.
-

 config QDIO_DEBUG
        bool "Extended debugging information"
        depends on QDIO
 config QDIO_DEBUG
        bool "Extended debugging information"
        depends on QDIO


@@ -380,7 +407,7 @@ config APPLDATA_BASE
 
 config APPLDATA_MEM
        tristate "Monitor memory management statistics"
 
 config APPLDATA_MEM
        tristate "Monitor memory management statistics"

-       depends on APPLDATA_BASE
+       depends on APPLDATA_BASE && VM_EVENT_COUNTERS

        help
          This provides memory management related data to the Linux - VM Monitor
          Stream, like paging/swapping rate, memory utilisation, etc.
        help
          This provides memory management related data to the Linux - VM Monitor
          Stream, like paging/swapping rate, memory utilisation, etc.


@@ -442,9 +469,16 @@ config NO_IDLE_HZ_INIT
          The HZ timer is switched off in idle by default. That means the
          HZ timer is already disabled at boot time.
 
          The HZ timer is switched off in idle by default. That means the
          HZ timer is already disabled at boot time.
 

+config S390_HYPFS_FS
+       bool "s390 hypervisor file system support"
+       select SYS_HYPERVISOR
+       default y
+       help
+         This is a virtual file system intended to provide accounting
+         information in an s390 hypervisor environment.
+

 config KEXEC
 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


@@ -460,6 +494,8 @@ config PCMCIA
 
 source "drivers/base/Kconfig"
 
 
 source "drivers/base/Kconfig"
 

+source "drivers/connector/Kconfig"
+

 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"


@@ -468,8 +504,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 "kernel/vserver/Kconfig"
 source "arch/s390/Kconfig.debug"
 
 source "kernel/vserver/Kconfig"