2 files changed, 8 insertions, 3 deletions

diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
index 950813b1eb36..2c8da9825fe3 100644
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -107,7 +107,8 @@ void __mmu_notifier_release(struct mm_struct *mm)
  * existed or not.
  */
 int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
-                                        unsigned long address)
+                                        unsigned long start,
+                                        unsigned long end)
 {
         struct mmu_notifier *mn;
         int young = 0, id;
@@ -115,7 +116,7 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
         id = srcu_read_lock(&srcu);
         hlist_for_each_entry_rcu(mn, &mm->mmu_notifier_mm->list, hlist) {
                 if (mn->ops->clear_flush_young)
-                        young |= mn->ops->clear_flush_young(mn, mm, address);
+                        young |= mn->ops->clear_flush_young(mn, mm, start, end);
         }
         srcu_read_unlock(&srcu, id);
 
diff --git a/mm/rmap.c b/mm/rmap.c
index 3e8491c504f8..bc74e0012809 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1355,7 +1355,11 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount,
                         continue;       /* don't unmap */
                 }
 
-                if (ptep_clear_flush_young_notify(vma, address, pte))
+                /*
+                 * No need for _notify because we're within an
+                 * mmu_notifier_invalidate_range_ {start|end} scope.
+                 */
+                if (ptep_clear_flush_young(vma, address, pte))
                         continue;
 
                 /* Nuke the page table entry. */