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>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 73a983489c60..914a81ee7855 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),