mips: rename PGD_ORDER to PGD_TABLE_ORDER

[linux-2.6-microblaze.git] / arch / mips / mm / tlbex.c

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 8dbbd99..a57519a 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -818,7 +818,7 @@ void build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,
                 * everything but the lower xuseg addresses goes down
                 * the module_alloc/vmalloc path.
                 */
-               uasm_i_dsrl_safe(p, ptr, tmp, PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+               uasm_i_dsrl_safe(p, ptr, tmp, PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_bnez(p, r, ptr, label_vmalloc);
        } else {
                uasm_il_bltz(p, r, tmp, label_vmalloc);
@@ -1127,7 +1127,7 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,
                        UASM_i_SW(p, scratch, scratchpad_offset(0), 0);
 
                uasm_i_dsrl_safe(p, scratch, tmp,
-                                PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+                                PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_bnez(p, r, scratch, label_vmalloc);
 
                if (pgd_reg == -1) {
@@ -1493,12 +1493,12 @@ static void setup_pw(void)
 #endif
        pgd_i = PGDIR_SHIFT;  /* 1st level PGD */
 #ifndef __PAGETABLE_PMD_FOLDED
-       pgd_w = PGDIR_SHIFT - PMD_SHIFT + PGD_ORDER;
+       pgd_w = PGDIR_SHIFT - PMD_SHIFT + PGD_TABLE_ORDER;
 
        pmd_i = PMD_SHIFT;    /* 2nd level PMD */
        pmd_w = PMD_SHIFT - PAGE_SHIFT;
 #else
-       pgd_w = PGDIR_SHIFT - PAGE_SHIFT + PGD_ORDER;
+       pgd_w = PGDIR_SHIFT - PAGE_SHIFT + PGD_TABLE_ORDER;
 #endif
 
        pt_i  = PAGE_SHIFT;    /* 3rd level PTE */
@@ -1536,7 +1536,7 @@ static void build_loongson3_tlb_refill_handler(void)
 
        if (check_for_high_segbits) {
                uasm_i_dmfc0(&p, K0, C0_BADVADDR);
-               uasm_i_dsrl_safe(&p, K1, K0, PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+               uasm_i_dsrl_safe(&p, K1, K0, PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_beqz(&p, &r, K1, label_vmalloc);
                uasm_i_nop(&p);
 
@@ -2065,7 +2065,7 @@ build_r4000_tlbchange_handler_head(u32 **p, struct uasm_label **l,
 
        UASM_i_MFC0(p, wr.r1, C0_BADVADDR);
        UASM_i_LW(p, wr.r2, 0, wr.r2);
-       UASM_i_SRL(p, wr.r1, wr.r1, PAGE_SHIFT + PTE_ORDER - PTE_T_LOG2);
+       UASM_i_SRL(p, wr.r1, wr.r1, PAGE_SHIFT - PTE_T_LOG2);
        uasm_i_andi(p, wr.r1, wr.r1, (PTRS_PER_PTE - 1) << PTE_T_LOG2);
        UASM_i_ADDU(p, wr.r2, wr.r2, wr.r1);
 
@@ -2611,7 +2611,7 @@ void build_tlb_refill_handler(void)
        check_pabits();
 
 #ifdef CONFIG_64BIT
-       check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+       check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
 #endif
 
        if (cpu_has_3kex) {