--- v4
+++ v3
@@ -7,10 +7,10 @@
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index daecf1db6cf1..f48e626d9c98 100644
+index 8e63e60c399c..bc2f139de4e7 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -2857,7 +2857,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
+@@ -2838,7 +2838,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
  	return ptlock_ptr(page_ptdesc(pmd_page(*pmd)));
  }
  
@@ -19,7 +19,7 @@
  {
  	/*
  	 * prep_new_page() initialize page->private (and therefore page->ptl)
-@@ -2866,10 +2866,10 @@ static inline bool ptlock_init(struct page *page)
+@@ -2847,10 +2847,10 @@ static inline bool ptlock_init(struct page *page)
  	 * It can happen if arch try to use slab for page table allocation:
  	 * slab code uses page->slab_cache, which share storage with page->ptl.
  	 */
@@ -33,7 +33,7 @@
  	return true;
  }
  
-@@ -2882,13 +2882,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
+@@ -2863,13 +2863,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
  	return &mm->page_table_lock;
  }
  static inline void ptlock_cache_init(void) {}
@@ -49,7 +49,7 @@
  		return false;
  	__SetPageTable(page);
  	inc_lruvec_page_state(page, NR_PAGETABLE);
-@@ -2947,7 +2947,7 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc)
+@@ -2928,7 +2928,7 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc)
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  	ptdesc->pmd_huge_pte = NULL;
  #endif