Skip to content

Commit 976ded4

Browse files
committed
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
2 parents da4b532 + 0f5e4ad commit 976ded4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/memblock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type,
424424
* of memory that aren't suitable for allocation
425425
*/
426426
if (!memblock_can_resize)
427-
return -1;
427+
panic("memblock: cannot resize %s array\n", type->name);
428428

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

0 commit comments

Comments
 (0)