Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 82cbffd0365495cd7a87fbef95c7d7280823291a..93acb3c1859d565e92774ed4700028ed10c4bbb0 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -3,6 +3,10 @@
 # see Documentation/kbuild/kconfig-language.txt.
 #
 
 # see Documentation/kbuild/kconfig-language.txt.
 #
 

+config SCHED_MC
+       def_bool y
+       depends on SMP
+

 config MMU
        def_bool y
 
 config MMU
        def_bool y
 


@@ -16,6 +20,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
 


@@ -36,6 +43,9 @@ config GENERIC_HWEIGHT
 config GENERIC_TIME
        def_bool y
 
 config GENERIC_TIME
        def_bool y
 

+config GENERIC_CLOCKEVENTS
+       def_bool y
+

 config GENERIC_BUG
        bool
        depends on BUG
 config GENERIC_BUG
        bool
        depends on BUG


@@ -47,12 +57,23 @@ 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
+
+config PGSTE
+       bool
+       default y if KVM
+

 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
+       select HAVE_KVM if 64BIT

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


@@ -60,6 +81,8 @@ menu "Base setup"
 
 comment "Processor type and features"
 
 
 comment "Processor type and features"
 

+source "kernel/time/Kconfig"
+

 config 64BIT
        bool "64 bit kernel"
        help
 config 64BIT
        bool "64 bit kernel"
        help


@@ -92,7 +115,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,6 +300,17 @@ comment "Kernel preemption"
 
 source "kernel/Kconfig.preempt"
 
 
 source "kernel/Kconfig.preempt"
 

+config ARCH_SPARSEMEM_ENABLE
+       def_bool y
+       select SPARSEMEM_VMEMMAP_ENABLE
+       select SPARSEMEM_VMEMMAP
+
+config ARCH_SPARSEMEM_DEFAULT
+       def_bool y
+
+config ARCH_SELECT_MEMORY_MODEL
+       def_bool y
+

 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"


@@ -291,10 +326,7 @@ config QDIO
        tristate "QDIO support"
        ---help---
          This driver provides the Queued Direct I/O base support for
        tristate "QDIO support"
        ---help---
          This driver provides the Queued Direct I/O base support for

-         IBM mainframes.
-
-         For details please refer to the documentation provided by IBM at
-         <http://www10.software.ibm.com/developerworks/opensource/linux390>
+         IBM System z.

 
          To compile this driver as a module, choose M here: the
          module will be called qdio.
 
          To compile this driver as a module, choose M here: the
          module will be called qdio.


@@ -341,6 +373,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


@@ -397,6 +433,13 @@ config CMM_IUCV
          Select this option to enable the special message interface to
          the cooperative memory management.
 
          Select this option to enable the special message interface to
          the cooperative memory management.
 

+config PAGE_STATES
+       bool "Unused page notification"
+       help
+         This enables the notification of unused pages to the
+         hypervisor. The ESSA instruction is used to do the states
+         changes between a page that has content and the unused state.
+

 config VIRT_TIMER
        bool "Virtual CPU timer support"
        help
 config VIRT_TIMER
        bool "Virtual CPU timer support"
        help


@@ -472,25 +515,6 @@ config APPLDATA_NET_SUM
 
 source kernel/Kconfig.hz
 
 
 source kernel/Kconfig.hz
 

-config NO_IDLE_HZ
-       bool "No HZ timer ticks in idle"
-       help
-         Switches the regular HZ timer off when the system is going idle.
-         This helps z/VM to detect that the Linux system is idle. VM can
-         then "swap-out" this guest which reduces memory usage. It also
-         reduces the overhead of idle systems.
-
-         The HZ timer can be switched on/off via /proc/sys/kernel/hz_timer.
-         hz_timer=0 means HZ timer is disabled. hz_timer=1 means HZ
-         timer is active.
-
-config NO_IDLE_HZ_INIT
-       bool "HZ timer in idle off by default"
-       depends on NO_IDLE_HZ
-       help
-         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
 config S390_HYPFS_FS
        bool "s390 hypervisor file system support"
        select SYS_HYPERVISOR


@@ -514,6 +538,13 @@ config ZFCPDUMP
          Select this option if you want to build an zfcpdump enabled kernel.
          Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 
          Select this option if you want to build an zfcpdump enabled kernel.
          Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 

+config S390_GUEST
+bool "s390 guest support (EXPERIMENTAL)"
+       depends on 64BIT && EXPERIMENTAL
+       select VIRTIO
+       select VIRTIO_RING
+       help
+         Select this option if you want to run the kernel under s390 linux

 endmenu
 
 source "net/Kconfig"
 endmenu
 
 source "net/Kconfig"


@@ -535,3 +566,5 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"

+
+source "arch/s390/kvm/Kconfig"