---

yaml --- r: 259124 b: refs/heads/master c: 3d41e0f h: refs/heads/master v: v3
git-mirror · Jun 29, 2011 · 7cc23a9 · 7cc23a9
1 parent 4ae00da
commit 7cc23a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);