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

Commit 6dd22700 authored by Scott Wood's avatar Scott Wood Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix memory limits when starting at a non-zero address 



memblock_enforce_memory_limit() takes the desired maximum quantity of memory
to end up with, not an address above which memory will not be used.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent c7704d35

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void __init move_device_tree(void) 
	start = __pa(initial_boot_params);

	size = be32_to_cpu(initial_boot_params->totalsize);



	if ((memory_limit && (start + size) > memory_limit) ||

	if ((memory_limit && (start + size) > PHYSICAL_START + memory_limit) ||

			overlaps_crashkernel(start, size)) {

		p = __va(memblock_alloc(size, PAGE_SIZE));

		memcpy(p, initial_boot_params, size);

arch/powerpc/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void __init MMU_init(void) 
		lowmem_end_addr = memstart_addr + total_lowmem;

#ifndef CONFIG_HIGHMEM

		total_memory = total_lowmem;

		memblock_enforce_memory_limit(lowmem_end_addr);

		memblock_enforce_memory_limit(total_lowmem);

		memblock_analyze();

#endif /* CONFIG_HIGHMEM */

	}