sh: mmu_gather rework

Fix up the sh mmu_gather code to conform to the new API.

Signed-off-by: Peter Zijlstra <[e-mail]>
Acked-by: Paul Mundt <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: David Miller <[e-mail]>
Cc: Martin Schwidefsky <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Jeff Dike <[e-mail]>
Cc: Richard Weinberger <[e-mail]>
Cc: Tony Luck <[e-mail]>
Cc: KAMEZAWA Hiroyuki <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Mel Gorman <[e-mail]>
Cc: KOSAKI Motohiro <[e-mail]>
Cc: Nick Piggin <[e-mail]>
Cc: Namhyung Kim <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>

arch/sh/include/asm/tlb.h

···
 	unsigned long		start, end;
 };
 
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static inline void init_tlb_gather(struct mmu_gather *tlb)
 {
 	tlb->start = TASK_SIZE;
···
 	}
 }
 
-static inline struct mmu_gather *
-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
 {
-	struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
 	tlb->mm = mm;
 	tlb->fullmm = full_mm_flush;
 
 	init_tlb_gather(tlb);
-
-	return tlb;
 }
 
 static inline void
···
 
 	/* keep the page table cache within bounds */
 	check_pgt_cache();
-
-	put_cpu_var(mmu_gathers);
 }
 
 static inline void
···
 	}
 }
 
-#define tlb_remove_page(tlb,page)	free_page_and_swap_cache(page)
+static inline void tlb_flush_mmu(struct mmu_gather *tlb)
+{
+}
+
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+	free_page_and_swap_cache(page);
+	return 1; /* avoid calling tlb_flush_mmu */
+}
+
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+	__tlb_remove_page(tlb, page);
+}
+
 #define pte_free_tlb(tlb, ptep, addr)	pte_free((tlb)->mm, ptep)
 #define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)->mm, pmdp)
 #define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)->mm, pudp)