[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1390946665-2967-1-git-send-email-yinghai@kernel.org>
Date: Tue, 28 Jan 2014 14:04:25 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
"'Russell King - ARM Linux'" <linux@....linux.org.uk>,
Kevin Hilman <khilman@...aro.org>,
Olof Johansson <olof@...om.net>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: Dave Hansen <dave.hansen@...el.com>,
Santosh Shilimkar <santosh.shilimkar@...com>,
linux-kernel@...r.kernel.org, Yinghai Lu <yinghai@...nel.org>
Subject: [PATCH] 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 <yinghai@...nel.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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists