From 6028caa1df8e88b00f5cb2fb78e85e7ad9ec5507 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 17 Sep 2004 04:02:26 +0000
Subject: [PATCH] Add default 2.6.8 configuration for PlanetLab Linux

---
 ...nfig => kernel-2.6.8-i686-planetlab.config} | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
 rename configs/{kernel-2.6.7-i686-planetlab.config => kernel-2.6.8-i686-planetlab.config} (98%)

diff --git a/configs/kernel-2.6.7-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
similarity index 98%
rename from configs/kernel-2.6.7-i686-planetlab.config
rename to configs/kernel-2.6.8-i686-planetlab.config
index b56a54e9d..7d9936db6 100644
--- a/configs/kernel-2.6.7-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -11,7 +11,6 @@ CONFIG_GENERIC_ISA_DMA=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
-CONFIG_STANDALONE=y
 CONFIG_BROKEN_ON_SMP=y
 
 #
@@ -181,6 +180,7 @@ CONFIG_BINFMT_MISC=y
 #
 # Generic Driver Options
 #
+CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 
@@ -548,13 +548,15 @@ CONFIG_IP_NF_MATCH_REALM=m
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
 
 #
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
 # CONFIG_NET_SCH_CBQ is not set
 CONFIG_NET_SCH_HTB=m
 # CONFIG_NET_SCH_HFSC is not set
@@ -580,6 +582,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_TUX is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
@@ -959,7 +962,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -1060,13 +1062,15 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # Linux VServer
 #
 CONFIG_VSERVER_LEGACY=y
-# CONFIG_PROC_SECURE is not set
+# CONFIG_VSERVER_PROC_SECURE is not set
 CONFIG_VSERVER_HARDCPU=y
 # CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_UID16 is not set
 # CONFIG_INOXID_GID16 is not set
-CONFIG_INOXID_GID24=y
-# CONFIG_INOXID_GID32 is not set
-# CONFIG_INOXID_MAGIC is not set
+CONFIG_INOXID_UGID24=y
+# CONFIG_INOXID_INTERN is not set
+# CONFIG_INOXID_RUNTIME is not set
+CONFIG_VSERVER_DEBUG=y
 
 #
 # Security options
-- 
2.47.0