tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

of: of_reserved_mem: only call memblock_free for normal reserved memory

For nomap case, the memory block will be removed by memblock_remove()
in early_init_dt_alloc_reserved_memory_arch(). So it's meaningless to
call memblock_free() on error path.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Link: https://lore.kernel.org/r/20210611131153.3731147-1-aisheng.dong@nxp.com
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Dong Aisheng and committed by
Rob Herring 3c6867a1 972d6a7d

+2 -1
+2 -1
drivers/of/of_reserved_mem.c
··· 275 275 if (err != 0 && err != -ENOENT) { 276 276 pr_info("node %s compatible matching fail\n", 277 277 rmem->name); 278 - memblock_free(rmem->base, rmem->size); 279 278 if (nomap) 280 279 memblock_add(rmem->base, rmem->size); 280 + else 281 + memblock_free(rmem->base, rmem->size); 281 282 } 282 283 } 283 284 }