Simple patch sent to Andi earlier today when I wasn't quite awake. Split into separate patch to make it easier to back out when it appears upstream. Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- memhotplug1-dave/arch/x86_64/mm/init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86_64/mm/init.c~H1-replace_direct_mem_map_references_with_pfn_to_page arch/x86_64/mm/init.c --- memhotplug1/arch/x86_64/mm/init.c~H1-replace_direct_mem_map_references_with_pfn_to_page 2004-11-04 16:45:45.000000000 -0800 +++ memhotplug1-dave/arch/x86_64/mm/init.c 2004-11-04 16:45:45.000000000 -0800 @@ -68,8 +68,8 @@ void show_mem(void) for_each_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; ++i) { - page = pgdat->node_mem_map + i; - total++; + page = pfn_to_page(pgdat->node_start_pfn + i); + total++; if (PageReserved(page)) reserved++; else if (PageSwapCache(page)) @@ -466,7 +466,7 @@ void __init mem_init(void) /* * Only count reserved RAM pages */ - if (page_is_ram(tmp) && PageReserved(mem_map+tmp)) + if (page_is_ram(tmp) && PageReserved(pfn_to_page(tmp))) reservedpages++; #endif _