Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.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, };
 
 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)