Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc64 / mm / tlb.c

diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c
index 3f10fc921b00e1bfb6279f8ccf00986ad7619089..ae24919cba7cf8bef8a0ad4f8455f5c871e3920f 100644 (file)
--- 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, };
 
 void flush_tlb_pending(void)
 {
-       struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
-
-       preempt_disable();
+       struct mmu_gather *mp = &get_cpu_var(mmu_gathers);
 
        if (mp->tlb_nr) {
                flush_tsb_user(mp);
@@ -42,7 +40,7 @@ void flush_tlb_pending(void)
                mp->tlb_nr = 0;
        }
 
-       preempt_enable();
+       put_cpu_var(mmu_gathers);
 }
 
 void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)