[CRYPTO] geode: Add __dev{init,exit} annotations

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 541382d539add2184cadd8e58e1d73e92c4858fe..c5b354b1409e13e80d32e366b5a9844d9481e0d6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -215,6 +215,18 @@ config USER_NS
          vservers, to use user namespaces to provide different
          user info for different servers.  If unsure, say N.
 
+config PID_NS
+       bool "PID Namespaces (EXPERIMENTAL)"
+       default n
+       depends on EXPERIMENTAL
+       help
+         Suport process id namespaces.  This allows having multiple
+         process with the same pid as long as they are in different
+         pid namespaces.  This is a building block of containers.
+
+         Unless you want to work with an experimental feature
+         say N here.
+
 config AUDIT
        bool "Auditing support"
        depends on NET
@@ -234,6 +246,10 @@ config AUDITSYSCALL
          such as SELinux.  To use audit's filesystem watch feature, please
          ensure that INOTIFY is configured.
 
+config AUDIT_TREE
+       def_bool y
+       depends on AUDITSYSCALL && INOTIFY
+
 config IKCONFIG
        tristate "Kernel .config support"
        ---help---
@@ -297,13 +313,6 @@ config CGROUP_NS
           for instance virtual servers and checkpoint/restart
           jobs.
 
-config CGROUP_CPUACCT
-       bool "Simple CPU accounting cgroup subsystem"
-       depends on CGROUPS
-       help
-         Provides a simple Resource Controller for monitoring the
-         total CPU consumed by the tasks in a cgroup
-
 config CPUSETS
        bool "Cpuset support"
        depends on SMP && CGROUPS
@@ -318,7 +327,6 @@ config CPUSETS
 config FAIR_GROUP_SCHED
        bool "Fair group CPU scheduler"
        default y
-       depends on EXPERIMENTAL
        help
          This feature lets CPU scheduler recognize task groups and control CPU
          bandwidth allocation to such task groups.