Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755606AbaA2BZV (ORCPT ); Tue, 28 Jan 2014 20:25:21 -0500 Received: from mail-qa0-f54.google.com ([209.85.216.54]:39711 "EHLO mail-qa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754658AbaA2BZU (ORCPT ); Tue, 28 Jan 2014 20:25:20 -0500 MIME-Version: 1.0 In-Reply-To: <1390946665-2967-1-git-send-email-yinghai@kernel.org> References: <1390946665-2967-1-git-send-email-yinghai@kernel.org> Date: Tue, 28 Jan 2014 17:25:19 -0800 Message-ID: Subject: Re: [PATCH] memblock: Add limit checking to memblock_virt_alloc From: Kevin Hilman To: Yinghai Lu Cc: Andrew Morton , Linus Torvalds , Ingo Molnar , "H. Peter Anvin" , Russell King - ARM Linux , Olof Johansson , Konrad Rzeszutek Wilk , Dave Hansen , Santosh Shilimkar , LKML Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 28, 2014 at 2:04 PM, Yinghai Lu 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 > > --- > 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 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/