[S390] Cleanup monreader printk messages.

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ba3a389fab94dcef61341973de66ae12992892cf..6199d1120900841ca57367cc33a01f36eff72d12 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        default "/boot/config-$UNAME_RELEASE"
        default "/lib/modules/$UNAME_RELEASE/.config"
        default "/etc/kernel-config"
        default "/boot/config-$UNAME_RELEASE"

+       default "$ARCH_DEFCONFIG"

        default "arch/$ARCH/defconfig"
 
 menu "General setup"
        default "arch/$ARCH/defconfig"
 
 menu "General setup"


@@ -259,17 +260,14 @@ config IKCONFIG_PROC
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 21

-       default 17 if S390 || LOCKDEP
-       default 16 if X86_NUMAQ || IA64
-       default 15 if SMP
-       default 14
+       default 17

        help
          Select kernel log buffer size as a power of 2.
        help
          Select kernel log buffer size as a power of 2.

-         Defaults and Examples:
-                    17 => 128 KB for S/390
-                    16 => 64 KB for x86 NUMAQ or IA-64
-                    15 => 32 KB for SMP
-                    14 => 16 KB for uniprocessor
+         Examples:
+                    17 => 128 KB
+                    16 => 64 KB
+                    15 => 32 KB
+                    14 => 16 KB

                     13 =>  8 KB
                     12 =>  4 KB
 
                     13 =>  8 KB
                     12 =>  4 KB
 


@@ -284,6 +282,7 @@ config CGROUPS
 config CGROUP_DEBUG
        bool "Example debug cgroup subsystem"
        depends on CGROUPS
 config CGROUP_DEBUG
        bool "Example debug cgroup subsystem"
        depends on CGROUPS

+       default n

        help
          This option enables a simple cgroup subsystem that
          exports useful debugging information about the cgroups
        help
          This option enables a simple cgroup subsystem that
          exports useful debugging information about the cgroups


@@ -300,6 +299,13 @@ config CGROUP_NS
           for instance virtual servers and checkpoint/restart
           jobs.
 
           for instance virtual servers and checkpoint/restart
           jobs.
 

+config CGROUP_DEVICE
+       bool "Device controller for cgroups"
+       depends on CGROUPS && EXPERIMENTAL
+       help
+         Provides a cgroup implementing whitelists for devices which
+         a process in the cgroup can mknod or open.
+

 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS
 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS


@@ -311,9 +317,16 @@ config CPUSETS
 
          Say N if unsure.
 
 
          Say N if unsure.
 

+#
+# Architectures with an unreliable sched_clock() should select this:
+#
+config HAVE_UNSTABLE_SCHED_CLOCK
+       bool
+

 config GROUP_SCHED
        bool "Group CPU scheduler"
 config GROUP_SCHED
        bool "Group CPU scheduler"

-       default y
+       depends on EXPERIMENTAL
+       default n

        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.
        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.


@@ -321,7 +334,7 @@ config GROUP_SCHED
 config FAIR_GROUP_SCHED
        bool "Group scheduling for SCHED_OTHER"
        depends on GROUP_SCHED
 config FAIR_GROUP_SCHED
        bool "Group scheduling for SCHED_OTHER"
        depends on GROUP_SCHED

-       default y
+       default GROUP_SCHED

 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"


@@ -373,9 +386,13 @@ config RESOURCE_COUNTERS
           infrastructure that works with cgroups
        depends on CGROUPS
 
           infrastructure that works with cgroups
        depends on CGROUPS
 

+config MM_OWNER
+       bool
+

 config CGROUP_MEM_RES_CTLR
        bool "Memory Resource Controller for Control Groups"
        depends on CGROUPS && RESOURCE_COUNTERS
 config CGROUP_MEM_RES_CTLR
        bool "Memory Resource Controller for Control Groups"
        depends on CGROUPS && RESOURCE_COUNTERS

+       select MM_OWNER

        help
          Provides a memory resource controller that manages both page cache and
          RSS memory.
        help
          Provides a memory resource controller that manages both page cache and
          RSS memory.


@@ -388,6 +405,9 @@ config CGROUP_MEM_RES_CTLR
          Only enable when you're ok with these trade offs and really
          sure you need the memory resource controller.
 
          Only enable when you're ok with these trade offs and really
          sure you need the memory resource controller.
 

+         This config option also selects MM_OWNER config option, which
+         could in turn add some fork/exit overhead.
+

 config SYSFS_DEPRECATED
        bool
 
 config SYSFS_DEPRECATED
        bool
 


@@ -496,16 +516,12 @@ source "usr/Kconfig"
 endif
 
 config CC_OPTIMIZE_FOR_SIZE
 endif
 
 config CC_OPTIMIZE_FOR_SIZE

-       bool "Optimize for size (Look out for broken compilers!)"
+       bool "Optimize for size"

        default y
        default y

-       depends on ARM || H8300 || SUPERH || EXPERIMENTAL

        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
 

-         WARNING: some versions of gcc may generate incorrect code with this
-         option.  If problems are observed, a gcc upgrade may be needed.
-

          If unsure, say N.
 
 config SYSCTL
          If unsure, say N.
 
 config SYSCTL


@@ -521,7 +537,7 @@ menuconfig EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED

-       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
+       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)

        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.


@@ -542,6 +558,17 @@ config SYSCTL_SYSCALL
 
          If unsure say Y here.
 
 
          If unsure say Y here.
 

+config SYSCTL_SYSCALL_CHECK
+       bool "Sysctl checks" if EMBEDDED
+       depends on SYSCTL_SYSCALL
+       default y
+       ---help---
+         sys_sysctl uses binary paths that have been found challenging
+         to properly maintain and use. This enables checks that help
+         you to keep things correct.
+
+         If unsure say Y here.
+

 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
         default y
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
         default y


@@ -608,6 +635,14 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 

+config PCSPKR_PLATFORM
+       bool "Enable PC-Speaker support" if EMBEDDED
+       depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+       default y
+       help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+

 config COMPAT_BRK
        bool "Disable heap randomization"
        default y
 config COMPAT_BRK
        bool "Disable heap randomization"
        default y


@@ -701,7 +736,7 @@ config VM_EVENT_COUNTERS
 config SLUB_DEBUG
        default y
        bool "Enable SLUB debugging support" if EMBEDDED
 config SLUB_DEBUG
        default y
        bool "Enable SLUB debugging support" if EMBEDDED

-       depends on SLUB
+       depends on SLUB && SYSFS

        help
          SLUB has extensive debug support features. Disabling these can
          result in significant savings in code size. This also disables
        help
          SLUB has extensive debug support features. Disabling these can
          result in significant savings in code size. This also disables


@@ -806,6 +841,15 @@ menuconfig MODULES
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config MODULE_FORCE_LOAD
+       bool "Forced module loading"
+       depends on MODULES
+       default n
+       help
+         Allow loading of modules without version information (ie. modprobe
+         --force).  Forced module loading sets the 'F' (forced) taint flag and
+         is usually a really bad idea.
+

 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES
 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES