diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-05-29 21:57:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-31 09:55:50 +0200 |
| commit | 163872950dc856fd23849c27f60049feaac49ae6 (patch) | |
| tree | 15307c36c2e3c7cd13b7f1b64bf583f29f46f377 /arch/x86/mm/discontig_32.c | |
| parent | x86: extend e820 early_res support 32bit -fix #3 (diff) | |
| download | linux-163872950dc856fd23849c27f60049feaac49ae6.tar.xz linux-163872950dc856fd23849c27f60049feaac49ae6.zip | |
x86: extend e820 early_res support 32bit -fix #4
reserve_early pgdata for 32bit numa
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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 914ccf983687..47749727907e 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c @@ -159,8 +159,13 @@ static void __init allocate_pgdat(int nid) if (nid && node_has_online_mem(nid)) NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; else { - NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); - min_low_pfn += PFN_UP(sizeof(pg_data_t)); + unsigned long pgdat_phys; + pgdat_phys = find_e820_area(min_low_pfn<<PAGE_SHIFT, + max_low_pfn<<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), + "NODE_DATA"); } } |