X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=init%2FKconfig;h=b9d11a899b8861576be26f883882c969d170701f;hb=d772b3b323a15588a757f5af28e51a57d0d2f622;hp=d35e44f4dd6b287342ae51a0e89bd59f127b3952;hpb=8c27eba54970c6ebbb408186e5baa2274435e869;p=linux-2.6-omap-h63xx.git

diff --git a/init/Kconfig b/init/Kconfig
index d35e44f4dd6..b9d11a899b8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -354,6 +354,13 @@ 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"
 	default y
@@ -651,6 +658,12 @@ endchoice
 
 endmenu		# General setup
 
+config SLABINFO
+	bool
+	depends on PROC_FS
+	depends on SLAB || SLUB
+	default y
+
 config RT_MUTEXES
 	boolean
 	select PLIST