diff --git a/[refs] b/[refs]
index ae67113c025c..127afe94c8c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e36863a550da44595b155c6b86ff46b50cbff5c0
+refs/heads/master: b6da0ffb09ad4468e6749488909f04f1efac5de3
diff --git a/trunk/arch/mips/mm/init.c b/trunk/arch/mips/mm/init.c
index 1aadeb42c5a5..11689e1a2924 100644
--- a/trunk/arch/mips/mm/init.c
+++ b/trunk/arch/mips/mm/init.c
@@ -368,7 +368,7 @@ void __init mem_init(void)
 #ifdef CONFIG_DISCONTIGMEM
 #error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet"
 #endif
-	max_mapnr = highend_pfn;
+	max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;
 #else
 	max_mapnr = max_low_pfn;
 #endif