git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 183e08e)
- merge revision 1.11
authorMark Huang <mlhuang@cs.princeton.edu>
Mon, 15 Nov 2004 17:58:05 +0000 (17:58 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Mon, 15 Nov 2004 17:58:05 +0000 (17:58 +0000)
date: 2004/11/09 16:48:52;  author: mef;  state: Exp;  lines: +1 -2
Turned off CKRM memory controller.
Waiting for PL2899 to be resolved, which involves waiting for the
CKRM/IBM folks.

configs/kernel-2.6.8-i686-planetlab.config patch | blob | history

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 5749723..ea66387 100644 (file)
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -31,8 +31,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y
 CONFIG_CKRM_RES_NUMTASKS=y
 CONFIG_CKRM_CPU_SCHEDULE=y
 CONFIG_CKRM_RES_BLKIO=y
-CONFIG_CKRM_RES_MEM=y
-# CONFIG_CKRM_MEM_LRUORDER_CHANGE is not set
+# CONFIG_CKRM_RES_MEM is not set
 # CONFIG_CKRM_TYPE_SOCKETCLASS is not set
 CONFIG_CKRM_RBCE=y
 CONFIG_SYSCTL=y
linux-2.6