mm/page_vma_mapped.c: explicitly compare pfn for normal, hugetlbfs and THP page

[linux-2.6-microblaze.git] / mm / page_vma_mapped.c

diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index eff4b45..719c352 100644 (file)
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -52,12 +52,16 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw)
        return true;
 }
 
-static inline bool pfn_in_hpage(struct page *hpage, unsigned long pfn)
+static inline bool pfn_is_match(struct page *page, unsigned long pfn)
 {
-       unsigned long hpage_pfn = page_to_pfn(hpage);
+       unsigned long page_pfn = page_to_pfn(page);
+
+       /* normal page and hugetlbfs page */
+       if (!PageTransCompound(page) || PageHuge(page))
+               return page_pfn == pfn;
 
        /* THP can be referenced by any subpage */
-       return pfn >= hpage_pfn && pfn - hpage_pfn < hpage_nr_pages(hpage);
+       return pfn >= page_pfn && pfn - page_pfn < hpage_nr_pages(page);
 }
 
 /**
@@ -108,7 +112,7 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw)
                pfn = pte_pfn(*pvmw->pte);
        }
 
-       return pfn_in_hpage(pvmw->page, pfn);
+       return pfn_is_match(pvmw->page, pfn);
 }
 
 /**