From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 8 Aug 2005 21:12:36 +0000 (+0000)
Subject: - merge revision 1.18
X-Git-Tag: planetlab-3_1-rc2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=366394278939fc75c772facdeb5239be6c912855;p=linux-2.6.git

- merge revision 1.18
date: 2005/06/06 16:57:04;  author: mlhuang;  state: Exp;  lines: +3 -4
- PL2545 WAR: disable CKRM numtasks controller
---

diff --git a/configs/kernel-2.6.10-i686-planetlab.config b/configs/kernel-2.6.10-i686-planetlab.config
index 28169663c..741d59781 100644
--- a/configs/kernel-2.6.10-i686-planetlab.config
+++ b/configs/kernel-2.6.10-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-1.771_FC2.2.planetlab.2005.05.24
-# Thu May 26 12:36:52 2005
+# Linux kernel version: 2.6.10-1.771_FC2.2.planetlab
+# Mon Jun  6 12:56:10 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -35,8 +35,7 @@ CONFIG_CKRM_TYPE_TASKCLASS=y
 CONFIG_CKRM_RES_NULL=m
 # CONFIG_CKRM_RES_MEM is not set
 # CONFIG_CKRM_TYPE_SOCKETCLASS is not set
-CONFIG_CKRM_RES_NUMTASKS=y
-# CONFIG_CKRM_RES_NUMTASKS_FORKRATE is not set
+# CONFIG_CKRM_RES_NUMTASKS is not set
 CONFIG_CKRM_CPU_SCHEDULE=y
 # CONFIG_CKRM_RES_BLKIO is not set
 CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT=y