From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Sat, 18 Sep 2004 11:50:22 +0000 (+0000)
Subject: enabled CKRM
X-Git-Tag: before-enable-kexec-patch~71
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec8d95651d28f8cdb33234dc630da4a05226f139;p=linux-2.6.git

enabled CKRM
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 7d9936db6..57726a9aa 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -24,7 +24,15 @@ CONFIG_BSD_PROCESS_ACCT=y
 #
 # Class Based Kernel Resource Management
 #
-# CONFIG_CKRM is not set
+CONFIG_CKRM=y
+CONFIG_RCFS_FS=y
+CONFIG_CKRM_TYPE_TASKCLASS=y
+CONFIG_CKRM_RES_NUMTASKS=y
+CONFIG_CKRM_CPU_SCHEDULE=y
+CONFIG_CKRM_CPU_MONITOR=y
+CONFIG_CKRM_RES_BLKIO=y
+# CONFIG_CKRM_TYPE_SOCKETCLASS is not set
+CONFIG_CKRM_RBCE=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
@@ -1063,7 +1071,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 #
 CONFIG_VSERVER_LEGACY=y
 # CONFIG_VSERVER_PROC_SECURE is not set
-CONFIG_VSERVER_HARDCPU=y
+# CONFIG_VSERVER_HARDCPU is not set
 # CONFIG_INOXID_NONE is not set
 # CONFIG_INOXID_UID16 is not set
 # CONFIG_INOXID_GID16 is not set