From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 28 Dec 2004 04:48:53 +0000 (+0000)
Subject: Turn off CKRM IO controller.  It should never have been turned on in the
X-Git-Tag: before-shares_write_debug-merge~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8f763de6e65a6aa0ee34577a79809210d9080dda;p=linux-2.6.git

Turn off CKRM IO controller.  It should never have been turned on in the
first place until we are truly ready to deploy it.
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index bf7a83505..fd74aed78 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -30,7 +30,7 @@ CONFIG_RCFS_FS=y
 CONFIG_CKRM_TYPE_TASKCLASS=y
 CONFIG_CKRM_RES_NUMTASKS=y
 CONFIG_CKRM_CPU_SCHEDULE=y
-CONFIG_CKRM_RES_BLKIO=y
+# CONFIG_CKRM_RES_BLKIO is not set
 # CONFIG_CKRM_RES_MEM is not set
 # CONFIG_CKRM_TYPE_SOCKETCLASS is not set
 CONFIG_CKRM_RBCE=y