2 files changed, 32 insertions, 26 deletions

diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index d8f21e24a82f..b1f279cd00bf 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -19,33 +19,34 @@
 
 /* Heavily inspired by the ppc64 code.  */
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+static DEFINE_PER_CPU(struct tlb_batch, tlb_batch);
 
 void flush_tlb_pending(void)
 {
-        struct mmu_gather *mp = &get_cpu_var(mmu_gathers);
+        struct tlb_batch *tb = &get_cpu_var(tlb_batch);
 
-        if (mp->tlb_nr) {
-                flush_tsb_user(mp);
+        if (tb->tlb_nr) {
+                flush_tsb_user(tb);
 
-                if (CTX_VALID(mp->mm->context)) {
+                if (CTX_VALID(tb->mm->context)) {
 #ifdef CONFIG_SMP
-                        smp_flush_tlb_pending(mp->mm, mp->tlb_nr,
-                                              &mp->vaddrs[0]);
+                        smp_flush_tlb_pending(tb->mm, tb->tlb_nr,
+                                              &tb->vaddrs[0]);
 #else
-                        __flush_tlb_pending(CTX_HWBITS(mp->mm->context),
-                                            mp->tlb_nr, &mp->vaddrs[0]);
+                        __flush_tlb_pending(CTX_HWBITS(tb->mm->context),
+                                            tb->tlb_nr, &tb->vaddrs[0]);
 #endif
                 }
-                mp->tlb_nr = 0;
+                tb->tlb_nr = 0;
         }
 
-        put_cpu_var(mmu_gathers);
+        put_cpu_var(tlb_batch);
 }
 
-void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)
+void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,
+                   pte_t *ptep, pte_t orig, int fullmm)
 {
-        struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
+        struct tlb_batch *tb = &get_cpu_var(tlb_batch);
         unsigned long nr;
 
         vaddr &= PAGE_MASK;
@@ -77,21 +78,25 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t
 
 no_cache_flush:
 
-        if (mp->fullmm)
+        if (fullmm) {
+                put_cpu_var(tlb_batch);
                 return;
+        }
 
-        nr = mp->tlb_nr;
+        nr = tb->tlb_nr;
 
-        if (unlikely(nr != 0 && mm != mp->mm)) {
+        if (unlikely(nr != 0 && mm != tb->mm)) {
                 flush_tlb_pending();
                 nr = 0;
         }
 
         if (nr == 0)
-                mp->mm = mm;
+                tb->mm = mm;
 
-        mp->vaddrs[nr] = vaddr;
-        mp->tlb_nr = ++nr;
+        tb->vaddrs[nr] = vaddr;
+        tb->tlb_nr = ++nr;
         if (nr >= TLB_BATCH_NR)
                 flush_tlb_pending();
+
+        put_cpu_var(tlb_batch);
 }
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index 101d7c82870b..948461513499 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -47,12 +47,13 @@ void flush_tsb_kernel_range(unsigned long start, unsigned long end)
         }
 }
 
-static void __flush_tsb_one(struct mmu_gather *mp, unsigned long hash_shift, unsigned long tsb, unsigned long nentries)
+static void __flush_tsb_one(struct tlb_batch *tb, unsigned long hash_shift,
+                            unsigned long tsb, unsigned long nentries)
 {
         unsigned long i;
 
-        for (i = 0; i < mp->tlb_nr; i++) {
-                unsigned long v = mp->vaddrs[i];
+        for (i = 0; i < tb->tlb_nr; i++) {
+                unsigned long v = tb->vaddrs[i];
                 unsigned long tag, ent, hash;
 
                 v &= ~0x1UL;
@@ -65,9 +66,9 @@ static void __flush_tsb_one(struct mmu_gather *mp, unsigned long hash_shift, uns
         }
 }
 
-void flush_tsb_user(struct mmu_gather *mp)
+void flush_tsb_user(struct tlb_batch *tb)
 {
-        struct mm_struct *mm = mp->mm;
+        struct mm_struct *mm = tb->mm;
         unsigned long nentries, base, flags;
 
         spin_lock_irqsave(&mm->context.lock, flags);
@@ -76,7 +77,7 @@ void flush_tsb_user(struct mmu_gather *mp)
         nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries;
         if (tlb_type == cheetah_plus || tlb_type == hypervisor)
                 base = __pa(base);
-        __flush_tsb_one(mp, PAGE_SHIFT, base, nentries);
+        __flush_tsb_one(tb, PAGE_SHIFT, base, nentries);
 
 #ifdef CONFIG_HUGETLB_PAGE
         if (mm->context.tsb_block[MM_TSB_HUGE].tsb) {
@@ -84,7 +85,7 @@ void flush_tsb_user(struct mmu_gather *mp)
                 nentries = mm->context.tsb_block[MM_TSB_HUGE].tsb_nentries;
                 if (tlb_type == cheetah_plus || tlb_type == hypervisor)
                         base = __pa(base);
-                __flush_tsb_one(mp, HPAGE_SHIFT, base, nentries);
+                __flush_tsb_one(tb, HPAGE_SHIFT, base, nentries);
         }
 #endif
         spin_unlock_irqrestore(&mm->context.lock, flags);