From 610bca3ec30642bcce5c6ec2cd80400166fd185d Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 24 Jun 2008 14:56:20 -0700 Subject: [PATCH] --- yaml --- r: 99915 b: refs/heads/master c: 1a0db38e5fa50eeb885194b1f4e494d4de55b918 h: refs/heads/master i: 99913: 76e864946ed1d5a4e2f17493a106958a070049a7 99911: 3fc43d15437fa87dbc11f55c2d4a7444214a8c8c v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a25bddaca79..63b5b5dd8cf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 976dd4dc99c3eaf45e3802ed46e3cc06a1ad8689 +refs/heads/master: 1a0db38e5fa50eeb885194b1f4e494d4de55b918 diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index 9b6049133a82..359e3afaaa6b 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/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