--- v3
+++ v2
@@ -46,10 +46,10 @@
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/mm/memory.c b/mm/memory.c
-index 5e98259c7ac0..18b39f930ce1 100644
+index 0ba14a5797b2..8c701e4f59d3 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -2432,7 +2432,8 @@ static bool pte_spinlock(struct vm_fault *vmf)
+@@ -2300,7 +2300,8 @@ static bool pte_spinlock(struct vm_fault *vmf)
  		goto out;
  
  	vmf->ptl = pte_lockptr(vmf->vma->vm_mm, vmf->pmd);
@@ -59,7 +59,7 @@
  
  	if (vma_has_changed(vmf)) {
  		spin_unlock(vmf->ptl);
-@@ -2468,8 +2469,20 @@ static bool pte_map_lock(struct vm_fault *vmf)
+@@ -2336,8 +2337,20 @@ static bool pte_map_lock(struct vm_fault *vmf)
  	if (vma_has_changed(vmf))
  		goto out;