shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: mm: Split memory banks that span multiple sections when sparsemem is enabled

Browse Source 
This fixes a crash in mem_init which assumes all pages in a memory bank
are part of the same page array.

Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Arve Hjønnevåg
2012-12-06 20:46:49 -08:00
parent 62f59056d4
commit 4ee50207d6
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mm/mmu.c
View File

@@ -1017,6 +1017,28 @@ void __init sanity_check_meminfo(void)
struct membank *bank = &meminfo.bank[j];
*bank = meminfo.bank[i];
#ifdef CONFIG_SPARSEMEM
if (pfn_to_section_nr(bank_pfn_start(bank)) !=
pfn_to_section_nr(bank_pfn_end(bank) - 1)) {
phys_addr_t sz;
unsigned long start_pfn = bank_pfn_start(bank);
unsigned long end_pfn = SECTION_ALIGN_UP(start_pfn + 1);
sz = ((phys_addr_t)(end_pfn - start_pfn) << PAGE_SHIFT);
if (meminfo.nr_banks >= NR_BANKS) {
pr_crit("NR_BANKS too low, ignoring %lld bytes of memory\n",
(unsigned long long)(bank->size - sz));
} else {
memmove(bank + 1, bank,
(meminfo.nr_banks - i) * sizeof(*bank));
meminfo.nr_banks++;
bank[1].size -= sz;
bank[1].start = __pfn_to_phys(end_pfn);
}
bank->size = sz;
}
#endif
if (bank->start > ULONG_MAX)
highmem = 1;