From: Liangliang Huang <huangll@xxxxxxxxxx> Signed-off-by: Liangliang Huang <huangll@xxxxxxxxxx> --- mm/memblock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/memblock.c b/mm/memblock.c index 913b2520a9a0..e48dea7144bb 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -655,7 +655,11 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, } } /* area below @rend is dealt with, forget about it */ - base = min(rend, end); + if (end < rend) { + base = end; + break; + } else + base = rend; } /* insert the remaining portion */ -- 2.25.1