rpms/kernel/F-13 config-ia64-generic, 1.28, 1.29 config-s390x, 1.23, 1.24 config-x86-generic, 1.96, 1.97 kernel.spec, 1.2093, 1.2094

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22939

Modified Files:
	config-ia64-generic config-s390x config-x86-generic 
	kernel.spec 
Log Message:
Remove a bunch of x86 options from config files that get set
  automatically, and can't be overridden.


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-ia64-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- config-ia64-generic	9 Jul 2010 09:09:11 -0000	1.28
+++ config-ia64-generic	13 Jul 2010 03:02:42 -0000	1.29
@@ -9,7 +9,6 @@ CONFIG_IA64=y
 CONFIG_64BIT=y
 # CONFIG_XEN is not set
 CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_EFI=y
 # CONFIG_ITANIUM is not set
 CONFIG_MCKINLEY=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-s390x,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- config-s390x	9 Jul 2010 09:09:11 -0000	1.23
+++ config-s390x	13 Jul 2010 03:02:42 -0000	1.24
@@ -13,7 +13,6 @@ CONFIG_HZ_100=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_NO_IDLE_HZ=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/config-x86-generic,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- config-x86-generic	9 Jul 2010 09:09:11 -0000	1.96
+++ config-x86-generic	13 Jul 2010 03:02:42 -0000	1.97
@@ -39,22 +39,10 @@ CONFIG_M686=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_HPET=y
 CONFIG_HPET_TIMER=y
 # CONFIG_HPET_MMAP is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2093
retrieving revision 1.2094
diff -u -p -r1.2093 -r1.2094
--- kernel.spec	9 Jul 2010 14:53:21 -0000	1.2093
+++ kernel.spec	13 Jul 2010 03:02:42 -0000	1.2094
@@ -2021,6 +2021,10 @@ fi
 
 
 %changelog
+* Mon Jul 12 2010 Dave Jones <davej at redhat.com>
+- Remove a bunch of x86 options from config files that get set
+  automatically, and can't be overridden.
+
 * Fri Jul 09 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-9
 - crypto-aesni-kill-module_alias.patch: kill MODULE_ALIAS to prevent
   aesni-intel from autoloading.