1 files changed, 15 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c5b354b1409e..f5becd2a12f6 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -354,8 +354,16 @@ config FAIR_CGROUP_SCHED
 
 endchoice
 
+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 SYSFS_DEPRECATED
         bool "Create deprecated sysfs files"
+        depends on SYSFS
         default y
         help
           This option creates deprecated symlinks such as the
@@ -438,7 +446,7 @@ menuconfig EMBEDDED
 
 config UID16
         bool "Enable 16-bit UID system calls" if EMBEDDED
-        depends on ARM || BFIN || 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 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
         default y
         help
           This enables the legacy 16-bit UID syscall wrappers.
@@ -651,6 +659,12 @@ endchoice
 
 endmenu         # General setup
 
+config SLABINFO
+        bool
+        depends on PROC_FS
+        depends on SLAB || SLUB
+        default y
+
 config RT_MUTEXES
         boolean
         select PLIST