Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86, mm: Use memblock memory loop instead of e820_RAM

Browse Source 
We need to handle E820_RAM and E820_RESERVED_KERNEL at the same time.

Also memblock has page aligned range for ram, so we could avoid mapping
partial pages.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/CAE9FiQVZirvaBMFYRfXMmWEcHbKSicQEHz4VAwUv0xFCk51ZNw@mail.gmail.com
Acked-by: Jacob Shin <jacob.shin@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: <stable@vger.kernel.org>
This commit is contained in:
Yinghai Lu 2012-10-22 16:35:18 -07:00 committed by H. Peter Anvin
parent 6ede1fd3cb
commit 1f2ff682ac
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/setup.c
View File

@ -921,18 +921,19 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
if (max_pfn > max_low_pfn) { if (max_pfn > max_low_pfn) {
int i; int i;
for (i = 0; i < e820.nr_map; i++) { unsigned long start, end;
struct e820entry *ei = &e820.map[i]; unsigned long start_pfn, end_pfn;
if (ei->addr + ei->size <= 1UL << 32) for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn,
continue; NULL) {
if (ei->type == E820_RESERVED) end = PFN_PHYS(end_pfn);
if (end <= (1UL<<32))
continue; continue;
start = PFN_PHYS(start_pfn);
max_pfn_mapped = init_memory_mapping( max_pfn_mapped = init_memory_mapping(
ei->addr < 1UL << 32 ? 1UL << 32 : ei->addr, max((1UL<<32), start), end);
ei->addr + ei->size);
} }
/* can we preseve max_low_pfn ?*/ /* can we preseve max_low_pfn ?*/