diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-01 23:53:50 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-03 13:26:28 +0200 |
| commit | 6af61a7614a306fe882a0c2b4ddc63b65aa66efc (patch) | |
| tree | a4027323b741d9784b5f3755fe7a276c536932ee /arch/x86/mm/discontig_32.c | |
| parent | 287572cb38de7f270b59191a0fecfa5c5de7765d (diff) | |
x86: clean up max_pfn_mapped usage - 32-bit
on 32-bit in head_32.S after initial page table is done, we get initial
max_pfn_mapped, and then kernel_physical_mapping_init will give us
a final one.
We need to use that to make sure find_e820_area will get valid addresses
for boot_map and for NODE_DATA(0) on numa32.
XEN PV and lguest may need to assign max_pfn_mapped too.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/discontig_32.c')
| -rw-r--r-- | arch/x86/mm/discontig_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 73a983489c6..914a81ee785 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c @@ -163,7 +163,8 @@ static void __init allocate_pgdat(int nid) else { unsigned long pgdat_phys; pgdat_phys = find_e820_area(min_low_pfn<<PAGE_SHIFT, - max_low_pfn<<PAGE_SHIFT, sizeof(pg_data_t), + (nid ? max_low_pfn:max_pfn_mapped)<<PAGE_SHIFT, + sizeof(pg_data_t), PAGE_SIZE); NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(pgdat_phys>>PAGE_SHIFT)); reserve_early(pgdat_phys, pgdat_phys + sizeof(pg_data_t), |