From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 24 Jun 2008 21:56:20 +0000 (-0700)
Subject: x86: get max_pfn_mapped in init_memory_mapping
X-Git-Tag: v2.6.27-rc1~1106^2~171
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1a0db38e5fa50eeb885194b1f4e494d4de55b918;p=linux-2.6-omap-h63xx.git

x86: get max_pfn_mapped in init_memory_mapping

so don't shift that in the loop

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 9b6049133a8..359e3afaaa6 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -346,7 +346,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end)
 	__flush_tlb_all();
 	update_page_count(PG_LEVEL_1G, pages);
 
-	return last_map_addr >> PAGE_SHIFT;
+	return last_map_addr;
 }
 
 static void __init find_early_table_space(unsigned long end)
@@ -556,7 +556,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon
 	if (!after_bootmem)
 		early_memtest(start_phys, end_phys);
 
-	return last_map_addr;
+	return last_map_addr >> PAGE_SHIFT;
 }
 
 #ifndef CONFIG_NUMA