Skip to content

Commit

Permalink
x86: get max_pfn_mapped in init_memory_mapping
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 8, 2008
1 parent 976dd4d commit 1a0db38
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1a0db38

Please sign in to comment.