mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Reported-by: Kevin Hilman <[email protected]> Tested-by: Kevin Hilman <[email protected]> Reported-by: Olof Johansson <[email protected]> Tested-by: Olof Johansson <[email protected]> Reported-by: Konrad Rzeszutek Wilk <[email protected]> Tested-by: Konrad Rzeszutek Wilk <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: "Strashko, Grygorii" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
58d5640ebd
commit
f544e14f3e
1 changed files with 3 additions and 0 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue