Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index e037a5a..f0e62e5 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -281,6 +281,7 @@ config 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
@@ -297,6 +298,13 @@ config CGROUP_NS
           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
@@ -370,9 +378,13 @@ config RESOURCE_COUNTERS
           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
+       select MM_OWNER
        help
          Provides a memory resource controller that manages both page cache and
          RSS memory.
@@ -385,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.
 
+         This config option also selects MM_OWNER config option, which
+         could in turn add some fork/exit overhead.
+
 config SYSFS_DEPRECATED
        bool
 
@@ -535,6 +550,17 @@ config SYSCTL_SYSCALL
 
          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
@@ -694,7 +720,7 @@ config VM_EVENT_COUNTERS
 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
@@ -799,6 +825,15 @@ menuconfig MODULES
 
          If unsure, say Y.
 
+config MODULE_FORCE_LOAD
+       bool "Forced module loading"
+       depends on MODULES
+       default n
+       help
+         This option allows loading of modules even if that would set the
+          'F' (forced) taint, due to lack of version info.  Which is
+         usually a really bad idea.
+
 config MODULE_UNLOAD
        bool "Module unloading"
        depends on MODULES