Commit 447cec03 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'memblock-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Pull memblock update from Mike Rapoport:
 "Report failures when memblock_can_resize is not set.

  Numerous memblock reservations at early boot may exhaust static
  memblock.reserved array and it is unnoticed because most of the
  callers don't check memblock_reserve() return value.

  In this case the system will crash later, but the reason is hard to
  identify.

  Replace return of an error with panic() when memblock.reserved is
  exhausted before it can be resized"

* tag 'memblock-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: report failures when memblock_can_resize is not set
parents c1ef4df1 e96c6b8f
...@@ -424,7 +424,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, ...@@ -424,7 +424,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type,
* of memory that aren't suitable for allocation * of memory that aren't suitable for allocation
*/ */
if (!memblock_can_resize) if (!memblock_can_resize)
return -1; panic("memblock: cannot resize %s array\n", type->name);
/* Calculate new doubled size */ /* Calculate new doubled size */
old_size = type->max * sizeof(struct memblock_region); old_size = type->max * sizeof(struct memblock_region);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment