diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:31 +0100 |
| commit | bed4f13065b520e564adffbfcd1c1a764a9c887e (patch) | |
| tree | d847ddd3bab64cb126ee6679dc4a949386554d55 /arch/x86/kernel/traps.c | |
| parent | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (diff) | |
| parent | bf8bd66d0580f296f257d371ee41a0a137b541c7 (diff) | |
| download | linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.tar.gz linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.tar.bz2 linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.zip | |
Merge branch 'x86/irq' into x86/core
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 c320c29255c2..73ece2633f47 100644 --- 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); |