From 8ad97985c2cf1b858a5fa3038cdee3a6912af0a8 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 14 Dec 2006 19:59:05 +0000
Subject: [PATCH] DISABLE -> BUILTIN : CONFIG_X86_PC BUILTIN -> DISABLE :
 CONFIG_X86_GENERICARCH BUILTIN -> DISABLE : CONFIG_X86_GENERIC      8 ->    
 16 : CONFIG_NR_CPUS REMOVED -> BUILTIN : CONFIG_ARCH_FLATMEM_ENABLE REMOVED
 -> BUILTIN : CONFIG_ARCH_SPARSEMEM_ENABLE REMOVED -> BUILTIN :
 CONFIG_ARCH_SELECT_MEMORY_MODEL DISABLE -> BUILTIN : CONFIG_SPARSEMEM_STATIC
 BUILTIN -> REMOVED : CONFIG_X86_CYCLONE_TIMER DISABLE -> REMOVED :
 CONFIG_NUMA

---
 .../kernel-2.6.18-i686-smp-planetlab.config   | 19 ++++++++++---------
 configs/kompare                               |  5 ++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/configs/kernel-2.6.18-i686-smp-planetlab.config b/configs/kernel-2.6.18-i686-smp-planetlab.config
index 6a67f7b54..c0531ea20 100644
--- a/configs/kernel-2.6.18-i686-smp-planetlab.config
+++ b/configs/kernel-2.6.18-i686-smp-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-1.2239_FC5.1
-# Thu Dec 14 04:15:34 2006
+# Linux kernel version: 2.6.18-1.2255_FC5.1
+# Thu Dec 14 19:55:19 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -100,7 +100,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # Processor type and features
 #
 CONFIG_SMP=y
-# CONFIG_X86_PC is not set
+CONFIG_X86_PC=y
 # CONFIG_X86_XEN is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -108,9 +108,8 @@ CONFIG_SMP=y
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_VISWS is not set
-CONFIG_X86_GENERICARCH=y
+# CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
-CONFIG_X86_CYCLONE_TIMER=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -133,7 +132,7 @@ CONFIG_MPENTIUM4=y
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
+# CONFIG_X86_GENERIC is not set
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
@@ -149,7 +148,7 @@ CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_HPET_TIMER=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=16
 # CONFIG_SCHED_SMT is not set
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y
@@ -183,14 +182,16 @@ CONFIG_HIGHMEM64G=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
-# CONFIG_NUMA is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_RESOURCES_64BIT=y
 CONFIG_HIGHPTE=y
diff --git a/configs/kompare b/configs/kompare
index 50db0b759..3d6676f57 100755
--- a/configs/kompare
+++ b/configs/kompare
@@ -5,7 +5,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: kompare,v 1.4 2006/12/01 16:21:33 mef Exp $
+# $Id: kompare,v 1.5 2006/12/14 05:08:53 mef Exp $
 #
 
 import sys, re, os
@@ -68,17 +68,20 @@ if args[0] == "-a":
 
 newstate = {None:'REMOVED',"is not set":'DISABLE','y':'BUILTIN','m':'MODULE '}
 keys = neworder
+seen = {}
 for key in keys:
     o = old.get(key,None)
     n = new[key]
     if n==o and not showall: continue
     print "%6s -> %6s : %s" % (newstate.get(o,o),newstate.get(n,n),key)
+    seen[key] = None
 
 # not sure we care about what options have been removed
 # from from.config file
 oldstate = {None:'REMOVED',"is not set":'DISABLE','y':'BUILTIN','m':'MODULE '}
 keys = oldorder
 for key in keys:
+    if seen.has_key(key): continue
     n = new.get(key,None)
     o = old[key]
     if n == o and not showall: continue
-- 
2.43.0