On Tue, Jan 28, 2014 at 2:04 PM, Yinghai Lu <[email protected]> wrote:
> 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]>
>
> ---
>  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);

Tested-by: Kevin Hilman <[email protected]>

Verified various ARM boots to be passing again.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to