aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mm/mmu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 31af3cb59a60..e46a6a446cdd 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1218,15 +1218,15 @@ void __init adjust_lowmem_bounds(void)
1218 1218
1219 high_memory = __va(arm_lowmem_limit - 1) + 1; 1219 high_memory = __va(arm_lowmem_limit - 1) + 1;
1220 1220
1221 if (!memblock_limit)
1222 memblock_limit = arm_lowmem_limit;
1223
1221 /* 1224 /*
1222 * Round the memblock limit down to a pmd size. This 1225 * Round the memblock limit down to a pmd size. This
1223 * helps to ensure that we will allocate memory from the 1226 * helps to ensure that we will allocate memory from the
1224 * last full pmd, which should be mapped. 1227 * last full pmd, which should be mapped.
1225 */ 1228 */
1226 if (memblock_limit) 1229 memblock_limit = round_down(memblock_limit, PMD_SIZE);
1227 memblock_limit = round_down(memblock_limit, PMD_SIZE);
1228 if (!memblock_limit)
1229 memblock_limit = arm_lowmem_limit;
1230 1230
1231 if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) { 1231 if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {
1232 if (memblock_end_of_DRAM() > arm_lowmem_limit) { 1232 if (memblock_end_of_DRAM() > arm_lowmem_limit) {