---

yaml --- r: 57478 b: refs/heads/master c: 12710a5 h: refs/heads/master v: v3
git-mirror · Jun 9, 2007 · 2e16c3c · 2e16c3c
1 parent 2708af4
commit 2e16c3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778e9a9c3e7193ea9f434f382947155ffb59c755
+refs/heads/master: 12710a56cb56e81bd8f457cc2f50c2ebfc0cb390
diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c
@@ -79,6 +79,8 @@ void show_mem(void)
 			if (unlikely(i % MAX_ORDER_NR_PAGES == 0)) {
 				touch_nmi_watchdog();
 			}
+			if (!pfn_valid(pgdat->node_start_pfn + i))
+				continue;
 			page = pfn_to_page(pgdat->node_start_pfn + i);
 			total++;
 			if (PageReserved(page))