Commit f544e14f authored Jan 29, 2014 by Yinghai Lu Committed by Linus Torvalds Jan 29, 2014

memblock: add limit checking to memblock_virt_alloc

In original bootmem wrapper for memblock, we have limit checking.

Add it to memblock_virt_alloc, to address arm and x86 booting crash.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Reported-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Reported-by: Olof Johansson <olof@lixom.net>
Tested-by: Olof Johansson <olof@lixom.net>
Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: "Strashko, Grygorii" <grygorii.strashko@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 58d5640e

mm/memblock.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1077,6 +1077,9 @@ static void * __init memblock_virt_alloc_internal(
		if (!align)
		align = SMP_CACHE_BYTES;

		if (max_addr > memblock.current_limit)
		max_addr = memblock.current_limit;

		again:
		alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
		nid);

Admin message