From 1a0db38e5fa50eeb885194b1f4e494d4de55b918 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 24 Jun 2008 14:56:20 -0700 Subject: [PATCH] x86: get max_pfn_mapped in init_memory_mapping so don't shift that in the loop Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/mm/init_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 9b6049133a82..359e3afaaa6b 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 -- 2.30.2