rpms/kernel/F-9 config-x86_64-generic, 1.30, 1.31 kernel.spec, 1.625, 1.626

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11701

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
* Tue Apr 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25-7
- Enable machine check exception handling on x86_64.



Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86_64-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-x86_64-generic	1 Apr 2008 17:10:37 -0000	1.30
+++ config-x86_64-generic	23 Apr 2008 00:35:58 -0000	1.31
@@ -141,7 +141,9 @@
 CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
 
+CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 
@@ -199,6 +201,7 @@
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP=y
 
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
@@ -247,15 +250,10 @@
 
 CONFIG_SENSORS_I5K_AMB=m
 
-# CONFIG_X86_MCE is not set
-
-CONFIG_SPARSEMEM_VMEMMAP=y
-
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_CPA_DEBUG is not set
-CONFIG_CRYPTO_SALSA20_X86_64=m
 
 CONFIG_HP_WATCHDOG=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- kernel.spec	22 Apr 2008 17:14:38 -0000	1.625
+++ kernel.spec	23 Apr 2008 00:35:58 -0000	1.626
@@ -1781,6 +1781,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Apr 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25-7
+- Enable machine check exception handling on x86_64.
+
 * Tue Apr 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25-6
 - Force hard reset on sleeping SATA links during probe (#436099)