Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19dc2f2 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 835fc943

arch/x86/kernel/setup_32.c

+2 −0
Original line number Diff line number Diff line
@@ -377,11 +377,13 @@ static unsigned long __init setup_memory(void) 
	if (max_pfn > max_low_pfn) {

		highstart_pfn = max_low_pfn;

	}

	memory_present(0, 0, highend_pfn);

	printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",

		pages_to_mb(highend_pfn - highstart_pfn));

	num_physpages = highend_pfn;

	high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;

#else

	memory_present(0, 0, max_low_pfn);

	num_physpages = max_low_pfn;

	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;

#endif