vserver 2.0 rc7

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 6dd3387..a7660cc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -55,6 +55,14 @@ config LOCK_KERNEL
        depends on SMP || PREEMPT
        default y
 
+config INIT_ENV_ARG_LIMIT
+       int
+       default 32 if !USERMODE
+       default 128 if USERMODE
+       help
+         This is the value of the two limits on the number of argument and of
+         env.var passed to init from the kernel command line.
+
 endmenu
 
 menu "General setup"
@@ -157,7 +165,6 @@ config SYSCTL
 config AUDIT
        bool "Auditing support"
        default y if SECURITY_SELINUX
-       default n
        help
          Enable auditing infrastructure that can be used with another
          kernel subsystem, such as SELinux (which requires this for
@@ -166,31 +173,13 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64)
+       depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML)
        default y if SECURITY_SELINUX
-       default n
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
          such as SELinux.
 
-config LOG_BUF_SHIFT
-       int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
-       range 12 21
-       default 17 if ARCH_S390
-       default 16 if X86_NUMAQ || IA64
-       default 15 if SMP
-       default 14
-       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
-                    13 =>  8 KB
-                    12 =>  4 KB
-
 config HOTPLUG
        bool "Support for hot-pluggable devices" if !ARCH_S390
        default ARCH_S390
@@ -237,6 +226,16 @@ config IKCONFIG_PROC
          This option enables access to the kernel configuration file
          through /proc/config.gz.
 
+config CPUSETS
+       bool "Cpuset support"
+       depends on SMP
+       help
+         This options will let you create and manage CPUSET's which
+         allow dynamically partitioning a system into sets of CPUs and
+         Memory Nodes and assigning tasks to run only within those sets.
+         This is primarily useful on large SMP or NUMA systems.
+
+         Say N if unsure.
 
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
@@ -276,6 +275,35 @@ config KALLSYMS_EXTRA_PASS
           reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
           you wait for kallsyms to be fixed.
 
+
+config PRINTK
+       default y
+       bool "Enable support for printk" if EMBEDDED
+       help
+         This option enables normal printk support. Removing it
+         eliminates most of the message strings from the kernel image
+         and makes the kernel more or less silent. As this makes it
+         very difficult to diagnose system problems, saying N here is
+         strongly discouraged.
+
+config BUG
+       bool "BUG() support" if EMBEDDED
+       default y
+       help
+          Disabling this option eliminates support for BUG and WARN, reducing
+          the size of your kernel image and potentially quietly ignoring
+          numerous fatal conditions. You should only consider disabling this
+          option for embedded systems with no facilities for reporting errors.
+          Just say Y.
+
+config BASE_FULL
+       default y
+       bool "Enable full-sized data structures for core" if EMBEDDED
+       help
+         Disabling this option reduces the size of miscellaneous core
+         kernel data structures. This saves memory on small machines,
+         but may reduce performance.
+
 config FUTEX
        bool "Enable futex support" if EMBEDDED
        default y
@@ -294,7 +322,6 @@ config EPOLL
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size" if EMBEDDED
        default y if ARM || H8300
-       default n
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
@@ -358,6 +385,11 @@ config TINY_SHMEM
        default !SHMEM
        bool
 
+config BASE_SMALL
+       int
+       default 0 if BASE_FULL
+       default 1 if !BASE_FULL
+
 menu "Loadable module support"
 
 config MODULES
@@ -410,7 +442,7 @@ config OBSOLETE_MODPARM
 
 config MODVERSIONS
        bool "Module versioning support (EXPERIMENTAL)"
-       depends on MODULES && EXPERIMENTAL && !USERMODE
+       depends on MODULES && EXPERIMENTAL
        help
          Usually, you have to use modules compiled with your kernel.
          Saying Y here makes it sometimes possible to use modules