1 files changed, 8 insertions, 8 deletions

diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c
index 3929a40bd6c0..cbb38545d9d6 100644
--- a/mm/pgtable-generic.c
+++ b/mm/pgtable-generic.c
@@ -151,14 +151,14 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
 void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
                                 pgtable_t pgtable)
 {
-        assert_spin_locked(&mm->page_table_lock);
+        assert_spin_locked(pmd_lockptr(mm, pmdp));
 
         /* FIFO */
-        if (!mm->pmd_huge_pte)
+        if (!pmd_huge_pte(mm, pmdp))
                 INIT_LIST_HEAD(&pgtable->lru);
         else
-                list_add(&pgtable->lru, &mm->pmd_huge_pte->lru);
-        mm->pmd_huge_pte = pgtable;
+                list_add(&pgtable->lru, &pmd_huge_pte(mm, pmdp)->lru);
+        pmd_huge_pte(mm, pmdp) = pgtable;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 #endif
@@ -170,14 +170,14 @@ pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)
 {
         pgtable_t pgtable;
 
-        assert_spin_locked(&mm->page_table_lock);
+        assert_spin_locked(pmd_lockptr(mm, pmdp));
 
         /* FIFO */
-        pgtable = mm->pmd_huge_pte;
+        pgtable = pmd_huge_pte(mm, pmdp);
         if (list_empty(&pgtable->lru))
-                mm->pmd_huge_pte = NULL;
+                pmd_huge_pte(mm, pmdp) = NULL;
         else {
-                mm->pmd_huge_pte = list_entry(pgtable->lru.next,
+                pmd_huge_pte(mm, pmdp) = list_entry(pgtable->lru.next,
                                               struct page, lru);
                 list_del(&pgtable->lru);
         }