Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238AbaA1WDr (ORCPT ); Tue, 28 Jan 2014 17:03:47 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:32788 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755742AbaA1WDp (ORCPT ); Tue, 28 Jan 2014 17:03:45 -0500 From: Yinghai Lu To: Andrew Morton , Linus Torvalds , Ingo Molnar , "H. Peter Anvin" , "'Russell King - ARM Linux'" , Kevin Hilman , Olof Johansson , Konrad Rzeszutek Wilk Cc: Dave Hansen , Santosh Shilimkar , linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH] memblock: Add limit checking to memblock_virt_alloc Date: Tue, 28 Jan 2014 14:04:25 -0800 Message-Id: <1390946665-2967-1-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 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/