Skip to content

Commit 447cec0

Browse files
committed
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
2 parents c1ef4df + e96c6b8 commit 447cec0

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)