From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 19 Oct 2004 23:05:37 +0000 (+0000)
Subject: Reenabled CKRM memory controller.
X-Git-Tag: before-enable-kexec-patch~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=01dca1a979ed3f01e5171ada8f37c8fba6bcb565;p=linux-2.6.git

Reenabled CKRM memory controller.
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 5bed0a847..3b380b04c 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -31,7 +31,8 @@ CONFIG_CKRM_TYPE_TASKCLASS=y
 CONFIG_CKRM_RES_NUMTASKS=y
 CONFIG_CKRM_CPU_SCHEDULE=y
 CONFIG_CKRM_RES_BLKIO=y
-# CONFIG_CKRM_RES_MEM is not set
+CONFIG_CKRM_RES_MEM=y
+# CONFIG_CKRM_MEM_LRUORDER_CHANGE is not set
 # CONFIG_CKRM_TYPE_SOCKETCLASS is not set
 CONFIG_CKRM_RBCE=y
 CONFIG_SYSCTL=y