Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 10 insertions, 3 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 64635f5278ff..b4b1feba6472 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1536,16 +1536,23 @@ pmd_t *page_check_address_pmd(struct page *page,
                               enum page_check_address_pmd_flag flag,
                               spinlock_t **ptl)
 {
+        pgd_t *pgd;
+        pud_t *pud;
         pmd_t *pmd;
 
         if (address & ~HPAGE_PMD_MASK)
                 return NULL;
 
-        pmd = mm_find_pmd(mm, address);
-        if (!pmd)
+        pgd = pgd_offset(mm, address);
+        if (!pgd_present(*pgd))
                 return NULL;
+        pud = pud_offset(pgd, address);
+        if (!pud_present(*pud))
+                return NULL;
+        pmd = pmd_offset(pud, address);
+
         *ptl = pmd_lock(mm, pmd);
-        if (pmd_none(*pmd))
+        if (!pmd_present(*pmd))
                 goto unlock;
         if (pmd_page(*pmd) != page)
                 goto unlock;