git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
tlb_32.c
diff --git
a/arch/x86/kernel/tlb_32.c
b/arch/x86/kernel/tlb_32.c
index
4290d91
..
8da059f
100644
(file)
--- 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)
smp_mb__after_clear_bit();
out:
put_cpu_no_resched();
smp_mb__after_clear_bit();
out:
put_cpu_no_resched();
-
__get_cpu_var(irq_stat).irq_tlb_count++
;
+
inc_irq_stat(irq_tlb_count)
;
}
void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
}
void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,