Skip to content

Commit

Permalink
mm/memblock.c: WARN_ON when flags differs from overlap region
Browse files Browse the repository at this point in the history
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: Wei Yang <weiyang@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Wei Yang authored and Linus Torvalds committed Sep 8, 2015
1 parent 7f3eb55 commit 4fcab5f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 4fcab5f

Please sign in to comment.