Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 92a4f7b4323a54e0f23453e714e0a7c714bab632..f6a68e178fc52952f31e4e95e7123af44252a919 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
 


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


@@ -61,6 +68,7 @@ config S390
        def_bool y
        select HAVE_OPROFILE
        select HAVE_KPROBES
        def_bool y
        select HAVE_OPROFILE
        select HAVE_KPROBES

+       select HAVE_KRETPROBES

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


@@ -68,6 +76,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


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


@@ -299,10 +310,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.


@@ -349,6 +357,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


@@ -480,25 +492,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