lkml.org 
[lkml]   [2008]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: get max_pfn_mapped in init_memory_mapping
Date

so don't shift that in the loop

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 0c92624..8bad202 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -398,7 +398,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)
@@ -606,7 +606,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

\
 
 \ /
  Last update: 2008-06-25 00:01    [W:3.161 / U:0.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site