X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configs%2Fkernel-2.6.18-i686-smp-planetlab.config;h=c0531ea208def96467ca03a999b13ac13c289255;hb=8ad97985c2cf1b858a5fa3038cdee3a6912af0a8;hp=6a67f7b54d2d5fa5d2d28294c09262529941258c;hpb=d3ec2a4ce4b4743ecf56c2ed7b32d74fd58210dc;p=linux-2.6.git

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