Commit 1a0db38e authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: get max_pfn_mapped in init_memory_mapping

so don't shift that in the loop
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 976dd4dc
...@@ -346,7 +346,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) ...@@ -346,7 +346,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end)
__flush_tlb_all(); __flush_tlb_all();
update_page_count(PG_LEVEL_1G, pages); 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) 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 ...@@ -556,7 +556,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon
if (!after_bootmem) if (!after_bootmem)
early_memtest(start_phys, end_phys); early_memtest(start_phys, end_phys);
return last_map_addr; return last_map_addr >> PAGE_SHIFT;
} }
#ifndef CONFIG_NUMA #ifndef CONFIG_NUMA
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment