Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"One final fix for 4.12 - Doug found a boot failure case triggered by
requesting a non-even MB vmalloc size"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8685/1: ensure memblock-limit is pmd-aligned
+4
-4
+4
-4
arch/arm/mm/mmu.c
+4
-4
arch/arm/mm/mmu.c
···
1218
1218
1219
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
1225
* Round the memblock limit down to a pmd size. This
1223
1226
* helps to ensure that we will allocate memory from the
1224
1227
* last full pmd, which should be mapped.
1225
1228
*/
1226
-
if (memblock_limit)
1227
-
memblock_limit = round_down(memblock_limit, PMD_SIZE);
1228
-
if (!memblock_limit)
1229
-
memblock_limit = arm_lowmem_limit;
1229
+
memblock_limit = round_down(memblock_limit, PMD_SIZE);
1230
1230
1231
1231
if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {
1232
1232
if (memblock_end_of_DRAM() > arm_lowmem_limit) {