Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH] memblock: Add limit checking to memblock_virt_alloc | Date | Tue, 28 Jan 2014 14:04:25 -0800 |
| |
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>
--- mm/memblock.c | 3 +++ 1 file changed, 3 insertions(+)
Index: linux-2.6/mm/memblock.c =================================================================== --- linux-2.6.orig/mm/memblock.c +++ linux-2.6/mm/memblock.c @@ -1077,6 +1077,9 @@ static void * __init memblock_virt_alloc 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);
| |