From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 12 Aug 2008 18:53:02 +0000 (+0000)
Subject: Enable IO-APIC-based watchdog by default.
X-Git-Tag: linux-2.6-22-24~2
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=c04790cdad8616558c4563a2effedb1a52b2508b

Enable IO-APIC-based watchdog by default.
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index af976c79c..0965d7c91 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -181,6 +181,7 @@ Patch620: linux-2.6-620-kdb.patch
 Patch630: linux-2.6-630-sched-fix.patch
 Patch640: linux-2.6-640-netlink-audit-hack.patch
 Patch650: linux-2.6-650-hangcheck-reboot.patch
+Patch660: linux-2.6-660-nmi-watchdog-default.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -386,6 +387,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 630
 %ApplyPatch 640
 %ApplyPatch 650
+%ApplyPatch 660
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
diff --git a/linux-2.6-660-nmi-watchdog-default.patch b/linux-2.6-660-nmi-watchdog-default.patch
new file mode 100644
index 000000000..3913754d1
--- /dev/null
+++ b/linux-2.6-660-nmi-watchdog-default.patch
@@ -0,0 +1,12 @@
+diff -Nurb linux-2.6.22-650/include/asm-i386/nmi.h linux-2.6.22-660/include/asm-i386/nmi.h
+--- linux-2.6.22-650/include/asm-i386/nmi.h	2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22-660/include/asm-i386/nmi.h	2008-08-12 14:51:44.000000000 -0400
+@@ -33,7 +33,7 @@
+ 
+ extern atomic_t nmi_active;
+ extern unsigned int nmi_watchdog;
+-#define NMI_DEFAULT     -1
++#define NMI_DEFAULT     1
+ #define NMI_NONE	0
+ #define NMI_IO_APIC	1
+ #define NMI_LOCAL_APIC	2