Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde304bd authored by Xishi Qiu's avatar Xishi Qiu Committed by Linus Torvalds
Browse files

mm/page_alloc.c: skip ZONE_MOVABLE if required_kernelcore is larger than totalpages



If kernelcore was not specified, or the kernelcore size is zero
(required_movablecore >= totalpages), or the kernelcore size is larger
than totalpages, there is no ZONE_MOVABLE.  We should fill the zone with
both kernel memory and movable memory.

Signed-off-by: default avatarXishi Qiu <qiuxishi@huawei.com>
Reviewed-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: <zhongjiang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2c1aad3
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -5675,8 +5675,11 @@ static void __init find_zone_movable_pfns_for_nodes(void)
		required_kernelcore = max(required_kernelcore, corepages);
	}

	/* If kernelcore was not specified, there is no ZONE_MOVABLE */
	if (!required_kernelcore)
	/*
	 * If kernelcore was not specified or kernelcore size is larger
	 * than totalpages, there is no ZONE_MOVABLE.
	 */
	if (!required_kernelcore || required_kernelcore >= totalpages)
		goto out;

	/* usable_startpfn is the lowest possible pfn ZONE_MOVABLE can be at */