Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

[mv-sheeva.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index f37cee75ab58f87d3c6ac6c0224d9694e946359c..141907ab6e2260adaa2f20cbcdc6747751184c64 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -481,11 +481,7 @@ do_nmi(struct pt_regs *regs, long error_code)
 {
        nmi_enter();
 
-#ifdef CONFIG_X86_32
-       { int cpu; cpu = smp_processor_id(); ++nmi_count(cpu); }
-#else
-       add_pda(__nmi_count, 1);
-#endif
+       inc_irq_stat(__nmi_count);
 
        if (!ignore_nmis)
                default_do_nmi(regs);