diff --git a/[refs] b/[refs]
index a7b69c1a40e8..49b829f80689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bddc8134db00002a9fd1b33fcb45747bdd3a2777
+refs/heads/master: f4dee85e2c6a7d7adf7ea4d6d3053a41c78175b7
diff --git a/trunk/arch/mips/mm/pgtable.c b/trunk/arch/mips/mm/pgtable.c
index 792c6eb44232..c93aa6cbcaca 100644
--- a/trunk/arch/mips/mm/pgtable.c
+++ b/trunk/arch/mips/mm/pgtable.c
@@ -15,6 +15,8 @@ void show_mem(void)
 	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 	pfn = max_mapnr;
 	while (pfn-- > 0) {
+		if (!pfn_valid(pfn))
+			continue;
 		page = pfn_to_page(pfn);
 		total++;
 		if (PageHighMem(page))