x86: nmi - consolidate nmi_watchdog_default for 32bit mode

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / nmi.c

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index cbd4fa3c475ba4ec95709f5514a88a626301a17f..27ca8f69b466767a086c369f4c67a36235aa847f 100644 (file)
--- a/arch/x86/kernel/nmi.c
+++ b/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) {