2 files changed, 6 insertions, 2 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 442177b1119a..c4b2646b6d7c 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1351,7 +1351,7 @@ static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask,
         struct numa_maps *md;
         struct page *page;
 
-        if (pte_none(*pte))
+        if (!pte_present(*pte))
                 return 0;
 
         page = pte_page(*pte);
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 78e1472933ea..30cc47f8ffa0 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -526,9 +526,13 @@ static void queue_pages_hugetlb_pmd_range(struct vm_area_struct *vma,
         int nid;
         struct page *page;
         spinlock_t *ptl;
+        pte_t entry;
 
         ptl = huge_pte_lock(hstate_vma(vma), vma->vm_mm, (pte_t *)pmd);
-        page = pte_page(huge_ptep_get((pte_t *)pmd));
+        entry = huge_ptep_get((pte_t *)pmd);
+        if (!pte_present(entry))
+                goto unlock;
+        page = pte_page(entry);
         nid = page_to_nid(page);
         if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))
                 goto unlock;