1 files changed, 13 insertions, 4 deletions

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 3063125197ad..b3353e21f3b3 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -15,6 +15,7 @@
 #ifndef _ASM_GENERIC__TLB_H
 #define _ASM_GENERIC__TLB_H
 
+#include <linux/mmu_notifier.h>
 #include <linux/swap.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
@@ -138,6 +139,16 @@ static inline void __tlb_reset_range(struct mmu_gather *tlb)
         }
 }
 
+static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)
+{
+        if (!tlb->end)
+                return;
+
+        tlb_flush(tlb);
+        mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end);
+        __tlb_reset_range(tlb);
+}
+
 static inline void tlb_remove_page_size(struct mmu_gather *tlb,
                                         struct page *page, int page_size)
 {
@@ -186,10 +197,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,
 
 #define __tlb_end_vma(tlb, vma)                                 \
         do {                                                    \
-                if (!tlb->fullmm && tlb->end) {                 \
-                        tlb_flush(tlb);                         \
-                        __tlb_reset_range(tlb);                 \
-                }                                               \
+                if (!tlb->fullmm)                               \
+                        tlb_flush_mmu_tlbonly(tlb);             \
         } while (0)
 
 #ifndef tlb_end_vma