rpms/kernel/FC-6 kernel-2.6.spec,1.2888,1.2889

Sun Jan 7 21:26:24 UTC 2007

Author: davej

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv2082

Modified Files:
	kernel-2.6.spec 
Log Message:
disable nmi watchdog by default


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2888
retrieving revision 1.2889
diff -u -r1.2888 -r1.2889

--- kernel-2.6.spec	6 Jan 2007 05:04:47 -0000	1.2888
+++ kernel-2.6.spec	7 Jan 2007 21:26:22 -0000	1.2889
@@ -463,6 +463,7 @@
 Patch2102: linux-2.6-defaults-phys-start.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
 Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
+Patch2105: linux-2.6-defaults-nonmi.patch
 
 # SATA Bits
 
@@ -1033,6 +1034,8 @@
 %patch2103 -p1
 # Disable split page table lock
 %patch2104 -p1
+# Disable NMI watchdog by default.
+%patch2105 -p1
 
 # ACPI patches
 
@@ -2009,6 +2012,9 @@
 %endif
 
 %changelog
+* Sun Jan  7 2007 Dave Jones <davej at redhat.com>
+- Disable NMI watchdog by default.
+
 * Sat Jan  6 2007 Dave Jones <davej at redhat.com>
 - 2.6.19.2rc1
 


