Merge branch 'x86/nmi' into x86/devel

[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 fd680c73ba77ee5a53c9c3edc017c6f92d3fe2b8..9ebf71323c9a4c49b503df13846de2a8e812c7cb 100644 (file)
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -27,6 +27,10 @@
 #include <linux/kdebug.h>
 #include <linux/smp.h>
 
+#include <asm/i8259.h>
+#include <asm/io_apic.h>
+#include <asm/smp.h>
+#include <asm/nmi.h>
 #include <asm/proto.h>
 #include <asm/timer.h>
 
@@ -129,7 +133,7 @@ int __init check_nmi_watchdog(void)
        if (!atomic_read(&nmi_active))
                return 0;
 
-       prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);
+       prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL);
        if (!prev_nmi_count)
                goto error;
 
@@ -175,11 +179,9 @@ int __init check_nmi_watchdog(void)
 
        kfree(prev_nmi_count);
        return 0;
-
 error:
-#ifdef CONFIG_X86_32
-       timer_ack = !cpu_has_tsc;
-#endif
+       if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259)
+               disable_8259A_irq(0);
        return -1;
 }