1 files changed, 3 insertions, 2 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 4cc19f6ab6c6..c4403cdf3433 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -525,8 +525,9 @@ static void queue_pages_hugetlb_pmd_range(struct vm_area_struct *vma,
 #ifdef CONFIG_HUGETLB_PAGE
         int nid;
         struct page *page;
+        spinlock_t *ptl;
 
-        spin_lock(&vma->vm_mm->page_table_lock);
+        ptl = huge_pte_lock(hstate_vma(vma), vma->vm_mm, (pte_t *)pmd);
         page = pte_page(huge_ptep_get((pte_t *)pmd));
         nid = page_to_nid(page);
         if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))
@@ -536,7 +537,7 @@ static void queue_pages_hugetlb_pmd_range(struct vm_area_struct *vma,
             (flags & MPOL_MF_MOVE && page_mapcount(page) == 1))
                 isolate_huge_page(page, private);
 unlock:
-        spin_unlock(&vma->vm_mm->page_table_lock);
+        spin_unlock(ptl);
 #else
         BUG();
 #endif