rpms/kernel/devel/configs config-i686-PAE, NONE, 1.1 config-i586, 1.8, 1.9 config-i686, 1.2, 1.3 config-x86-generic, 1.48, 1.49 config-i686-smp, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7756/configs

Modified Files:
	config-i586 config-i686 config-x86-generic 
Added Files:
	config-i686-PAE 
Removed Files:
	config-i686-smp 
Log Message:
Bye kernel-i686-smp
Hello kernel-PAE




--- NEW FILE config-i686-PAE ---
CONFIG_M686=y
# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y



Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-i586	8 Mar 2006 23:55:07 -0000	1.8
+++ config-i586	10 Apr 2006 19:14:07 -0000	1.9
@@ -54,3 +54,5 @@
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_VIA is not set
 
+# CONFIG_X86_UP_APIC is not set
+


Index: config-i686
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i686,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i686	16 Nov 2005 05:13:42 -0000	1.2
+++ config-i686	10 Apr 2006 19:14:07 -0000	1.3
@@ -1,5 +1,4 @@
 CONFIG_M686=y
-# CONFIG_SMP is not set
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- config-x86-generic	4 Apr 2006 20:37:01 -0000	1.48
+++ config-x86-generic	10 Apr 2006 19:14:07 -0000	1.49
@@ -3,14 +3,17 @@
 #
 # Processor type and features
 #
-CONFIG_X86_PC=y
+#
+# Enable summit and co via the generic arch
+#
+# CONFIG_X86_PC is not set
+CONFIG_X86_GENERICARCH=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -31,6 +34,8 @@
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_XADD=y
@@ -49,7 +54,6 @@
 CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
-CONFIG_NR_CPUS=8
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y
@@ -64,16 +68,10 @@
 CONFIG_X86_CPUID=m
 CONFIG_EDD=m
 # CONFIG_NUMA is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_APIC_DEFAULT_OFF=y
-CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
@@ -292,3 +290,4 @@
 
 CONFIG_SND_ES18XX=m
 
+


--- config-i686-smp DELETED ---