From 978896489c000e8d6e5466a0bf87999bd931618c Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed, 4 Jun 2008 01:00:47 +0400
Subject: [PATCH] --- yaml --- r: 99817 b: refs/heads/master c:
 3ed3f06295e69700fa808396f7b350bff2b69de0 h: refs/heads/master i:   99815:
 e17aa15effab7a59264049ba340460637c1e9325 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/kernel/nmi.c | 14 ++++++++------
 trunk/include/asm-x86/nmi.h |  4 +---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 0e7c08831f9a..602801af90c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1ba1da2b4ff4ace7801e99fb9a3095b182d847
+refs/heads/master: 3ed3f06295e69700fa808396f7b350bff2b69de0
diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/arch/x86/kernel/nmi.c
index cbd4fa3c475b..27ca8f69b466 100644
--- a/trunk/arch/x86/kernel/nmi.c
+++ b/trunk/arch/x86/kernel/nmi.c
@@ -487,14 +487,16 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file,
 		return -EIO;
 	}
 
-#ifdef CONFIG_X86_64
 	/* if nmi_watchdog is not set yet, then set it */
 	nmi_watchdog_default();
-#else
-	if (lapic_watchdog_ok())
-		nmi_watchdog = NMI_LOCAL_APIC;
-	else
-		nmi_watchdog = NMI_IO_APIC;
+
+#ifdef CONFIG_X86_32
+	if (nmi_watchdog == NMI_NONE) {
+		if (lapic_watchdog_ok())
+			nmi_watchdog = NMI_LOCAL_APIC;
+		else
+			nmi_watchdog = NMI_IO_APIC;
+	}
 #endif
 
 	if (nmi_watchdog == NMI_LOCAL_APIC) {
diff --git a/trunk/include/asm-x86/nmi.h b/trunk/include/asm-x86/nmi.h
index 972a4f6f799a..470bb4aacb75 100644
--- a/trunk/include/asm-x86/nmi.h
+++ b/trunk/include/asm-x86/nmi.h
@@ -38,12 +38,10 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev)
 
 #ifdef CONFIG_X86_64
 extern void default_do_nmi(struct pt_regs *);
-extern void nmi_watchdog_default(void);
-#else
-#define nmi_watchdog_default() do { } while (0)
 #endif
 
 extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
+extern void nmi_watchdog_default(void);
 extern int check_nmi_watchdog(void);
 extern int nmi_watchdog_enabled;
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);