Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a61a54c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e18aca02 9e25ebfe

arch/arm/mm/mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -1218,15 +1218,15 @@ void __init adjust_lowmem_bounds(void) 


	high_memory = __va(arm_lowmem_limit - 1) + 1;



	if (!memblock_limit)

		memblock_limit = arm_lowmem_limit;



	/*

	 * Round the memblock limit down to a pmd size.  This

	 * helps to ensure that we will allocate memory from the

	 * last full pmd, which should be mapped.

	 */

	if (memblock_limit)

	memblock_limit = round_down(memblock_limit, PMD_SIZE);

	if (!memblock_limit)

		memblock_limit = arm_lowmem_limit;



	if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {

		if (memblock_end_of_DRAM() > arm_lowmem_limit) {