From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 15 Oct 2004 20:51:06 +0000 (+0000)
Subject: enabled ckrm memory controller
X-Git-Tag: before-enable-kexec-patch~43
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3a5c949ce468a243d14086c7103ec13fdb7bed35;p=linux-2.6.git

enabled ckrm memory controller
---

diff --git a/configs/kernel-2.6.8-i686-planetlab-desktop.config b/configs/kernel-2.6.8-i686-planetlab-desktop.config
index b3687550d..9426fb0c2 100644
--- a/configs/kernel-2.6.8-i686-planetlab-desktop.config
+++ b/configs/kernel-2.6.8-i686-planetlab-desktop.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
@@ -40,6 +41,7 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_HOTPLUG is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_OOM_PANIC=y
 # CONFIG_EMBEDDED is not set
 # CONFIG_DELAY_ACCT is not set
 CONFIG_KALLSYMS=y