diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:31 -0500 |
| commit | bed4f13065b520e564adffbfcd1c1a764a9c887e (patch) | |
| tree | d847ddd3bab64cb126ee6679dc4a949386554d55 /arch/x86/kernel/tlb_32.c | |
| parent | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (diff) | |
| parent | bf8bd66d0580f296f257d371ee41a0a137b541c7 (diff) | |
Merge branch 'x86/irq' into x86/core
Diffstat (limited to 'arch/x86/kernel/tlb_32.c')
| -rw-r--r-- | arch/x86/kernel/tlb_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c index 4290d918b58a..8da059f949be 100644 --- a/arch/x86/kernel/tlb_32.c +++ b/arch/x86/kernel/tlb_32.c | |||
| @@ -118,7 +118,7 @@ void smp_invalidate_interrupt(struct pt_regs *regs) | |||
| 118 | smp_mb__after_clear_bit(); | 118 | smp_mb__after_clear_bit(); |
| 119 | out: | 119 | out: |
| 120 | put_cpu_no_resched(); | 120 | put_cpu_no_resched(); |
| 121 | __get_cpu_var(irq_stat).irq_tlb_count++; | 121 | inc_irq_stat(irq_tlb_count); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm, | 124 | void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm, |