lguest: remove bogus NULL cpu check

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

diff --git a/init/Kconfig b/init/Kconfig
index 7fccf09bb95ad8adeb929829dc1bb624c84ffc82..3e7b257fc05fca6fba4d6325a3da1ae95c3f9fde 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -259,17 +259,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 +281,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 +298,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


@@ -328,6 +333,13 @@ config RT_GROUP_SCHED
        depends on EXPERIMENTAL
        depends on GROUP_SCHED
        default n
        depends on EXPERIMENTAL
        depends on GROUP_SCHED
        default n

+       help
+         This feature lets you explicitly allocate real CPU bandwidth
+         to users or control groups (depending on the "Basis for grouping tasks"
+         setting below. If enabled, it will also make it impossible to
+         schedule realtime tasks for non-root users until you allocate
+         realtime bandwidth for them.
+         See Documentation/sched-rt-group.txt for more information.

 
 choice
        depends on GROUP_SCHED
 
 choice
        depends on GROUP_SCHED


@@ -366,9 +378,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.


@@ -381,6 +397,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
 


@@ -489,16 +508,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


@@ -514,7 +529,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.


@@ -535,6 +550,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