From: Wandun Chen Date: Wed, 27 May 2026 03:29:10 +0000 (+0800) Subject: of: reserved_mem: zero total_reserved_mem_cnt if no valid /reserved-memory entry X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50a488de5fccfc58eedc6d0525f92dc64a41f806;p=thirdparty%2Fkernel%2Flinux.git of: reserved_mem: zero total_reserved_mem_cnt if no valid /reserved-memory entry Prepare for storing /memreserve/ entries in the reserved_mem array. Zero total_reserved_mem_cnt if no valid /reserved-memory entry, instead of keeping it's initial value of MAX_RESERVED_REGIONS, this allows accounting /memreserve entries based on total_reserved_mem_cnt in a follow-up patch. No functional change. Signed-off-by: Wandun Chen Link: https://patch.msgid.link/20260527032917.3385849-5-chenwandun1@gmail.com Signed-off-by: Rob Herring (Arm) --- diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index c41f5550cb7b2..82222bd45ac66 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -336,11 +336,14 @@ int __init fdt_scan_reserved_mem(void) const void *fdt = initial_boot_params; node = fdt_path_offset(fdt, "/reserved-memory"); - if (node < 0) + if (node < 0) { + total_reserved_mem_cnt = 0; return -ENODEV; + } if (__reserved_mem_check_root(node) != 0) { pr_err("Reserved memory: unsupported node format, ignoring\n"); + total_reserved_mem_cnt = 0; return -EINVAL; }