Merge branch 'x86/irq' into x86/core

2008-12-23 16:30:31 +01:00
parent 3e5621edb3 bf8bd66d05
commit bed4f13065
20 changed files with 1062 additions and 954 deletions
--- 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);