Merge branch 'x86/core' into x86/cleanups

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index dbfb80289928..961e26a69d55 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -483,11 +483,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);