diff options
Diffstat (limited to 'arch/sparc64/mm/tlb.c')
-rw-r--r-- | arch/sparc64/mm/tlb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c index 3f10fc921b00..ae24919cba7c 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c | |||
@@ -23,9 +23,7 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, }; | |||
23 | 23 | ||
24 | void flush_tlb_pending(void) | 24 | void flush_tlb_pending(void) |
25 | { | 25 | { |
26 | struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); | 26 | struct mmu_gather *mp = &get_cpu_var(mmu_gathers); |
27 | |||
28 | preempt_disable(); | ||
29 | 27 | ||
30 | if (mp->tlb_nr) { | 28 | if (mp->tlb_nr) { |
31 | flush_tsb_user(mp); | 29 | flush_tsb_user(mp); |
@@ -42,7 +40,7 @@ void flush_tlb_pending(void) | |||
42 | mp->tlb_nr = 0; | 40 | mp->tlb_nr = 0; |
43 | } | 41 | } |
44 | 42 | ||
45 | preempt_enable(); | 43 | put_cpu_var(mmu_gathers); |
46 | } | 44 | } |
47 | 45 | ||
48 | void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig) | 46 | void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig) |