x86: change propagate_e820_map() back to find_max_pfn(), 32-bit, fix
add memory_present() calls for sparse and non-numa. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
835fc943f3
commit
f19dc2f22a
1 changed files with 2 additions and 0 deletions
|
@ -377,11 +377,13 @@ static unsigned long __init setup_memory(void)
|
||||||
if (max_pfn > max_low_pfn) {
|
if (max_pfn > max_low_pfn) {
|
||||||
highstart_pfn = max_low_pfn;
|
highstart_pfn = max_low_pfn;
|
||||||
}
|
}
|
||||||
|
memory_present(0, 0, highend_pfn);
|
||||||
printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
|
printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
|
||||||
pages_to_mb(highend_pfn - highstart_pfn));
|
pages_to_mb(highend_pfn - highstart_pfn));
|
||||||
num_physpages = highend_pfn;
|
num_physpages = highend_pfn;
|
||||||
high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;
|
high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;
|
||||||
#else
|
#else
|
||||||
|
memory_present(0, 0, max_low_pfn);
|
||||||
num_physpages = max_low_pfn;
|
num_physpages = max_low_pfn;
|
||||||
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
|
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue