diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-24 17:56:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:10:35 -0400 |
commit | 1a0db38e5fa50eeb885194b1f4e494d4de55b918 (patch) | |
tree | 439a4053c6a3c1dd38818fdbfb429fdf92b7c08e /arch/x86/mm/init_64.c | |
parent | 976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689 (diff) |
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>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r-- | arch/x86/mm/init_64.c | 4 |
1 files 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) | |||
346 | __flush_tlb_all(); | 346 | __flush_tlb_all(); |
347 | update_page_count(PG_LEVEL_1G, pages); | 347 | update_page_count(PG_LEVEL_1G, pages); |
348 | 348 | ||
349 | return last_map_addr >> PAGE_SHIFT; | 349 | return last_map_addr; |
350 | } | 350 | } |
351 | 351 | ||
352 | static void __init find_early_table_space(unsigned long end) | 352 | 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 | if (!after_bootmem) | 556 | if (!after_bootmem) |
557 | early_memtest(start_phys, end_phys); | 557 | early_memtest(start_phys, end_phys); |
558 | 558 | ||
559 | return last_map_addr; | 559 | return last_map_addr >> PAGE_SHIFT; |
560 | } | 560 | } |
561 | 561 | ||
562 | #ifndef CONFIG_NUMA | 562 | #ifndef CONFIG_NUMA |