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

Commit c0a29498 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds
Browse files

mm/memblock: WARN_ON when nid differs from overlap region 



Each memblock_region has nid to indicates the Node ID of this range.  For
the overlap case, memblock_add_range() inserts the lower part and leave
the upper part as indicated in the overlapped region.

If the nid of the new range differs from the overlapped region, the
information recorded is not correct.

This patch adds a WARN_ON when the nid of the new range differs from the
overlapped region.

Signed-off-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7e1e3cc

mm/memblock.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -566,6 +566,9 @@ int __init_memblock memblock_add_range(struct memblock_type *type, 
		 * area, insert that portion.

		 * area, insert that portion.

		 */

		 */

		if (rbase > base) {

		if (rbase > base) {

#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

			WARN_ON(nid != memblock_get_region_node(rgn));

#endif

			nr_new++;

			nr_new++;

			if (insert)

			if (insert)

				memblock_insert_region(type, i++, base,

				memblock_insert_region(type, i++, base,