SOURCES (LINUX_2_6): kernel-i386-smp.config, kernel-i386.config - ...

blues blues at pld-linux.org
Tue Aug 8 20:53:43 CEST 2006


Author: blues                        Date: Tue Aug  8 18:53:43 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- a bit fixed

---- Files affected:
SOURCES:
   kernel-i386-smp.config (1.59.10.137 -> 1.59.10.138) , kernel-i386.config (1.82.10.145 -> 1.82.10.146) 

---- Diffs:

================================================================
Index: SOURCES/kernel-i386-smp.config
diff -u SOURCES/kernel-i386-smp.config:1.59.10.137 SOURCES/kernel-i386-smp.config:1.59.10.138
--- SOURCES/kernel-i386-smp.config:1.59.10.137	Tue Aug  1 15:29:11 2006
+++ SOURCES/kernel-i386-smp.config	Tue Aug  8 20:53:37 2006
@@ -98,6 +98,7 @@
 #
 # Processor type and features
 #
+CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -138,7 +139,6 @@
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_SMP=y
 CONFIG_NR_CPUS=16
 CONFIG_SCHED_SMT=y
 # CONFIG_PREEMPT_NONE is not set

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.145 SOURCES/kernel-i386.config:1.82.10.146
--- SOURCES/kernel-i386.config:1.82.10.145	Tue Aug  1 15:29:11 2006
+++ SOURCES/kernel-i386.config	Tue Aug  8 20:53:37 2006
@@ -101,12 +101,12 @@
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
+CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-CONFIG_M686=y
+# CONFIG_M686 is not set
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.137&r2=1.59.10.138&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.145&r2=1.82.10.146&f=u



More information about the pld-cvs-commit mailing list