From 7cc23a94e715d905e24e09c69836f9b10e8f44ef Mon Sep 17 00:00:00 2001
From: Becky Bruce <beckyb@kernel.crashing.org>
Date: Tue, 28 Jun 2011 09:54:46 +0000
Subject: [PATCH] --- yaml --- r: 259124 b: refs/heads/master c:
 3d41e0f6d91cedcab08dff2f5e148b20c87a7432 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/mem.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 146e7253f4e3..c3bf00e21cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72632ce5a4ee8c75aa7cc17eb4473fcf625b8941
+refs/heads/master: 3d41e0f6d91cedcab08dff2f5e148b20c87a7432
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index 57e545b84bf1..097b288779e2 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -337,8 +337,9 @@ void __init mem_init(void)
 
 		highmem_mapnr = lowmem_end_addr >> PAGE_SHIFT;
 		for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
+			phys_addr_t paddr = (phys_addr_t)pfn << PAGE_SHIFT;
 			struct page *page = pfn_to_page(pfn);
-			if (memblock_is_reserved(pfn << PAGE_SHIFT))
+			if (memblock_is_reserved(paddr))
 				continue;
 			ClearPageReserved(page);
 			init_page_count(page);