---

yaml --- r: 99915 b: refs/heads/master c: 1a0db38 h: refs/heads/master i: 99913: 76e8649 99911: 3fc43d1 v: v3
git-mirror · Jul 8, 2008 · 610bca3 · 610bca3
1 parent fc916cd
commit 610bca3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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