From 2e16c3c7be5cafeb2f1a082bdfaf6bb361649250 Mon Sep 17 00:00:00 2001
From: Bob Picco <bob.picco@hp.com>
Date: Fri, 8 Jun 2007 13:47:00 -0700
Subject: [PATCH] --- yaml --- r: 57478 b: refs/heads/master c:
 12710a56cb56e81bd8f457cc2f50c2ebfc0cb390 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/init.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5d67629181da..008ac2aff957 100644
--- 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
index 1ad5111aec38..efb6e845114e 100644
--- 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))