Subject: [merged] memblock-add-limit-checking-to-memblock_virt_alloc.patch removed from -mm tree
To: yinghai@xxxxxxxxxx,dave.hansen@xxxxxxxxx,grygorii.strashko@xxxxxx,hpa@xxxxxxxxx,khilman@xxxxxxxxxx,konrad.wilk@xxxxxxxxxx,mingo@xxxxxxx,olof@xxxxxxxxx,sachin.kamat@xxxxxxxxxx,santosh.shilimkar@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 30 Jan 2014 12:05:22 -0800
The patch titled
Subject: memblock: add limit checking to memblock_virt_alloc
has been removed from the -mm tree. Its filename was
memblock-add-limit-checking-to-memblock_virt_alloc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yinghai Lu <yinghai@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Reported-by: Kevin Hilman <khilman@xxxxxxxxxx>
Tested-by: Kevin Hilman <khilman@xxxxxxxxxx>
Reported-by: Olof Johansson <olof@xxxxxxxxx>
Tested-by: Olof Johansson <olof@xxxxxxxxx>
Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: "Strashko, Grygorii" <grygorii.strashko@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 3 +++
1 file changed, 3 insertions(+)
diff -puN mm/memblock.c~memblock-add-limit-checking-to-memblock_virt_alloc mm/memblock.c
--- a/mm/memblock.c~memblock-add-limit-checking-to-memblock_virt_alloc
+++ a/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);
_
Patches currently in -mm which might be from yinghai@xxxxxxxxxx are
origin.patch
memblock-bootmem-restore-goal-for-alloc_low.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
