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

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

mm/memblock.c: WARN_ON when flags differs from overlap region 



Each memblock_region has flags to indicates the type 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 flags of the new range differs from the overlapped region, the
information recorded is not correct.

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

Signed-off-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f3eb55b

mm/memblock.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ int __init_memblock memblock_add_range(struct memblock_type *type, 
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

			WARN_ON(nid != memblock_get_region_node(rgn));

#endif

			WARN_ON(flags != rgn->flags);

			nr_new++;

			if (insert)

				memblock_insert_region(type, i++, base,