Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[J-linux.git] / arch / mips / mm / init.c

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index aa75849c36bcdd79489e4933d334232985d298c5..8ce2983a701526a5f1bdfd243ad61d8b80375b1d 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -348,7 +348,7 @@ void maar_init(void)
                upper = ((upper & MIPS_MAAR_ADDR) << 4) | 0xffff;
 
                pr_info("  [%d]: ", i / 2);
-               if (!(attr & MIPS_MAAR_V)) {
+               if (!(attr & MIPS_MAAR_VL)) {
                        pr_cont("disabled\n");
                        continue;
                }
@@ -537,6 +537,9 @@ unsigned long pgd_current[NR_CPUS];
  * it in the linker script.
  */
 pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
+#ifndef __PAGETABLE_PUD_FOLDED
+pud_t invalid_pud_table[PTRS_PER_PUD] __page_aligned_bss;
+#endif
 #ifndef __PAGETABLE_PMD_FOLDED
 pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
 EXPORT_SYMBOL_GPL(invalid_pmd_table);