diff options
| author | Ingo Molnar | 2008-12-23 16:30:31 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-12-23 16:30:31 +0100 |
| commit | bed4f13065b520e564adffbfcd1c1a764a9c887e (patch) | |
| tree | d847ddd3bab64cb126ee6679dc4a949386554d55 /arch/x86/kernel/smp.c | |
| parent | Merge branch 'x86/iommu' into x86/core (diff) | |
| parent | Merge branch 'x86/apic' into x86/irq (diff) | |
| download | kernel-qcow2-linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.tar.gz kernel-qcow2-linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.tar.xz kernel-qcow2-linux-bed4f13065b520e564adffbfcd1c1a764a9c887e.zip | |
Merge branch 'x86/irq' into x86/core
Diffstat (limited to 'arch/x86/kernel/smp.c')
| -rw-r--r-- | arch/x86/kernel/smp.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 3f92b134ab90..7e558db362c1 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -165,11 +165,7 @@ static void native_smp_send_stop(void) void smp_reschedule_interrupt(struct pt_regs *regs) { ack_APIC_irq(); -#ifdef CONFIG_X86_32 - __get_cpu_var(irq_stat).irq_resched_count++; -#else - add_pda(irq_resched_count, 1); -#endif + inc_irq_stat(irq_resched_count); } void smp_call_function_interrupt(struct pt_regs *regs) @@ -177,11 +173,7 @@ void smp_call_function_interrupt(struct pt_regs *regs) ack_APIC_irq(); irq_enter(); generic_smp_call_function_interrupt(); -#ifdef CONFIG_X86_32 - __get_cpu_var(irq_stat).irq_call_count++; -#else - add_pda(irq_call_count, 1); -#endif + inc_irq_stat(irq_call_count); irq_exit(); } @@ -190,11 +182,7 @@ void smp_call_function_single_interrupt(struct pt_regs *regs) ack_APIC_irq(); irq_enter(); generic_smp_call_function_single_interrupt(); -#ifdef CONFIG_X86_32 - __get_cpu_var(irq_stat).irq_call_count++; -#else - add_pda(irq_call_count, 1); -#endif + inc_irq_stat(irq_call_count); irq_exit(); } |