x86: rename PTE_MASK to PTE_PFN_MASK

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / dump_pagetables.c

diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 0bb0caed8971878152ed52d26dce836637bf82f7..cc174fc412bcfd264ce7e89f7b048932fcb7a4ea 100644 (file)
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -148,8 +148,8 @@ static void note_page(struct seq_file *m, struct pg_state *st,
         * we have now. "break" is either changing perms, levels or
         * address space marker.
         */
-       prot = pgprot_val(new_prot) & ~(PTE_MASK);
-       cur = pgprot_val(st->current_prot) & ~(PTE_MASK);
+       prot = pgprot_val(new_prot) & ~(PTE_PFN_MASK);
+       cur = pgprot_val(st->current_prot) & ~(PTE_PFN_MASK);
 
        if (!st->level) {
                /* First entry */
@@ -221,7 +221,7 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr,
        for (i = 0; i < PTRS_PER_PMD; i++) {
                st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);
                if (!pmd_none(*start)) {
-                       pgprotval_t prot = pmd_val(*start) & ~PTE_MASK;
+                       pgprotval_t prot = pmd_val(*start) & ~PTE_PFN_MASK;
 
                        if (pmd_large(*start) || !pmd_present(*start))
                                note_page(m, st, __pgprot(prot), 3);
@@ -253,7 +253,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr,
        for (i = 0; i < PTRS_PER_PUD; i++) {
                st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);
                if (!pud_none(*start)) {
-                       pgprotval_t prot = pud_val(*start) & ~PTE_MASK;
+                       pgprotval_t prot = pud_val(*start) & ~PTE_PFN_MASK;
 
                        if (pud_large(*start) || !pud_present(*start))
                                note_page(m, st, __pgprot(prot), 2);
@@ -288,7 +288,7 @@ static void walk_pgd_level(struct seq_file *m)
        for (i = 0; i < PTRS_PER_PGD; i++) {
                st.current_address = normalize_addr(i * PGD_LEVEL_MULT);
                if (!pgd_none(*start)) {
-                       pgprotval_t prot = pgd_val(*start) & ~PTE_MASK;
+                       pgprotval_t prot = pgd_val(*start) & ~PTE_PFN_MASK;
 
                        if (pgd_large(*start) || !pgd_present(*start))
                                note_page(m, &st, __pgprot(prot), 1);