Turn null ckrm class controller on as a module (CONFIG_CKRM_RES_NULL).

[linux-2.6.git] / configs / kernel-2.6.10-i686-planetlab.config

diff --git a/configs/kernel-2.6.10-i686-planetlab.config b/configs/kernel-2.6.10-i686-planetlab.config
index 1fc0e1e..7816de8 100644 (file)
--- a/configs/kernel-2.6.10-i686-planetlab.config
+++ b/configs/kernel-2.6.10-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-1.12_FC2.1.planetlab
-# Wed Feb 16 17:28:06 2005
+# Linux kernel version: 2.6.10-1.14_FC2.1.planetlab
+# Wed Mar  2 15:48:12 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -32,6 +32,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_CKRM=y
 CONFIG_RCFS_FS=y
 CONFIG_CKRM_TYPE_TASKCLASS=y
+CONFIG_CKRM_RES_NULL=m
 CONFIG_CKRM_RES_NUMTASKS=y
 CONFIG_CKRM_CPU_SCHEDULE=y
 # CONFIG_CKRM_RES_BLKIO is not set
@@ -2556,6 +2557,7 @@ CONFIG_STACK_WARN=4096
 #
 # Linux VServer
 #
+CONFIG_VSERVER_FILESHARING=y
 CONFIG_VSERVER_LEGACY=y
 # CONFIG_VSERVER_PROC_SECURE is not set
 # CONFIG_VSERVER_HARDCPU is not set