diff options
-rw-r--r-- | arch/x86/mm/discontig_32.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 914a81ee7855..7ced26ab9aec 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
@@ -328,6 +328,7 @@ unsigned long __init setup_memory(void) | |||
328 | { | 328 | { |
329 | int nid; | 329 | int nid; |
330 | unsigned long system_start_pfn, system_max_low_pfn; | 330 | unsigned long system_start_pfn, system_max_low_pfn; |
331 | long kva_target_pfn; | ||
331 | 332 | ||
332 | /* | 333 | /* |
333 | * When mapping a NUMA machine we allocate the node_mem_map arrays | 334 | * When mapping a NUMA machine we allocate the node_mem_map arrays |
@@ -344,11 +345,17 @@ unsigned long __init setup_memory(void) | |||
344 | system_start_pfn = min_low_pfn = PFN_UP(init_pg_tables_end); | 345 | system_start_pfn = min_low_pfn = PFN_UP(init_pg_tables_end); |
345 | 346 | ||
346 | system_max_low_pfn = max_low_pfn = find_max_low_pfn(); | 347 | system_max_low_pfn = max_low_pfn = find_max_low_pfn(); |
347 | kva_start_pfn = round_down(max_low_pfn - kva_pages, PTRS_PER_PTE); | 348 | kva_target_pfn = round_down(max_low_pfn - kva_pages, PTRS_PER_PTE); |
348 | kva_start_pfn = find_e820_area(kva_start_pfn<<PAGE_SHIFT, | 349 | do { |
349 | max_low_pfn<<PAGE_SHIFT, | 350 | kva_start_pfn = find_e820_area(kva_target_pfn<<PAGE_SHIFT, |
350 | kva_pages<<PAGE_SHIFT, | 351 | max_low_pfn<<PAGE_SHIFT, |
351 | PTRS_PER_PTE<<PAGE_SHIFT) >> PAGE_SHIFT; | 352 | kva_pages<<PAGE_SHIFT, |
353 | PTRS_PER_PTE<<PAGE_SHIFT) >> PAGE_SHIFT; | ||
354 | kva_target_pfn -= PTRS_PER_PTE; | ||
355 | } while (kva_start_pfn == -1UL && kva_target_pfn > min_low_pfn); | ||
356 | |||
357 | if (kva_start_pfn == -1UL) | ||
358 | panic("Can not get kva space\n"); | ||
352 | 359 | ||
353 | printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", | 360 | printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", |
354 | kva_start_pfn, max_low_pfn); | 361 | kva_start_pfn, max_low_pfn); |