diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-24 14:56:20 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:10:35 +0200 |
| commit | 1a0db38e5fa50eeb885194b1f4e494d4de55b918 (patch) | |
| tree | 439a4053c6a3c1dd38818fdbfb429fdf92b7c08e /arch/x86/mm/init_64.c | |
| parent | 976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689 (diff) | |
| download | op-kernel-dev-1a0db38e5fa50eeb885194b1f4e494d4de55b918.zip op-kernel-dev-1a0db38e5fa50eeb885194b1f4e494d4de55b918.tar.gz | |
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 9b60491..359e3af 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 |
