Skip to content

Commit

Permalink
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/rppt/memblock.git
  • Loading branch information
Stephen Rothwell committed Aug 1, 2023
2 parents e01ef57 + 0f5e4ad commit 066d7cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type,
* of memory that aren't suitable for allocation
*/
if (!memblock_can_resize)
return -1;
panic("memblock: cannot resize %s array\n", type->name);

/* Calculate new doubled size */
old_size = type->max * sizeof(struct memblock_region);
Expand Down

0 comments on commit 066d7cb

Please sign in to comment.