diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
| commit | 34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb (patch) | |
| tree | 5465f999b2b067744220b66c89b75f0f10445d6e /arch/x86/kernel/traps.c | |
| parent | bd8b96dfc216eebc72950a6c40da8d3eca8667df (diff) | |
| parent | 79a66b96c339626a3e4b226fefc0e45244cfe6ff (diff) | |
| download | op-kernel-dev-34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb.zip op-kernel-dev-34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb.tar.gz | |
Merge branch 'x86/core' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index dbfb802..961e26a 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); |
