powerpc: drop _PAGE_FILE and pte_file()-related helpers

[deliverable/linux.git] / arch / powerpc / mm / pgtable_64.c

diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 4fe5f64cc1793e693693dc0ca92420ce99dc6209..6957cc1ca0a7f42b2980161b04378f2d56d5b964 100644 (file)
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -718,7 +718,8 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
                pmd_t *pmdp, pmd_t pmd)
 {
 #ifdef CONFIG_DEBUG_VM
-       WARN_ON(pmd_val(*pmdp) & _PAGE_PRESENT);
+       WARN_ON((pmd_val(*pmdp) & (_PAGE_PRESENT | _PAGE_USER)) ==
+               (_PAGE_PRESENT | _PAGE_USER));
        assert_spin_locked(&mm->page_table_lock);
        WARN_ON(!pmd_trans_huge(pmd));
 #endif
@@ -781,7 +782,7 @@ pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot)
 {
        pmd_t pmd;
        /*
-        * For a valid pte, we would have _PAGE_PRESENT or _PAGE_FILE always
+        * For a valid pte, we would have _PAGE_PRESENT always
         * set. We use this to check THP page at pmd level.
         * leaf pte for huge page, bottom two bits != 00
         */