diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-12 13:41:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-12 13:41:03 +0000 |
| commit | 6660800fb7fd0f66faecb3c550fe59709220ade5 (patch) | |
| tree | 19f95c0579bc13ba8c1d326e5058330e2fd14d63 /arch/arm/mm/init.c | |
| parent | 598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (diff) | |
| parent | 06312f44ad638c02e26c5f187c9ee8f94cbaa3a2 (diff) | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 7f8cd1b3557f..49bd08178008 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -192,7 +192,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low, #ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid(unsigned long pfn) { - return memblock_is_memory(__pfn_to_phys(pfn)); + return memblock_is_map_memory(__pfn_to_phys(pfn)); } EXPORT_SYMBOL(pfn_valid); #endif @@ -433,6 +433,9 @@ static void __init free_highpages(void) if (end <= max_low) continue; + if (memblock_is_nomap(mem)) + continue; + /* Truncate partial highmem entries */ if (start < max_low) start = max_low; |