1 files changed, 3 insertions, 5 deletions

diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h
index 1eda17954f39..61c01882b562 100644
--- a/include/asm-sparc64/tlb.h
+++ b/include/asm-sparc64/tlb.h
@@ -58,11 +58,9 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i
 static inline void tlb_flush_mmu(struct mmu_gather *mp)
 {
         if (mp->need_flush) {
+                free_pages_and_swap_cache(mp->pages, mp->pages_nr);
+                mp->pages_nr = 0;
                 mp->need_flush = 0;
-                if (!tlb_fast_mode(mp)) {
-                        free_pages_and_swap_cache(mp->pages, mp->pages_nr);
-                        mp->pages_nr = 0;
-                }
         }
 
 }
@@ -91,11 +89,11 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un
 
 static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page)
 {
-        mp->need_flush = 1;
         if (tlb_fast_mode(mp)) {
                 free_page_and_swap_cache(page);
                 return;
         }
+        mp->need_flush = 1;
         mp->pages[mp->pages_nr++] = page;
         if (mp->pages_nr >= FREE_PTE_NR)
                 tlb_flush_mmu(mp);