Skip to content

Commit da2d488

Browse files
twd2palmer-dabbelt
authored andcommitted
RISC-V: Fix memblock_free() usages in init_resources()
`memblock_free()` takes a physical address as its first argument. Fix the wrong usages in `init_resources()`. Fixes: ffe0e52 ("RISC-V: Improve init_resources()") Fixes: 797f037 ("RISC-V: Do not allocate memblock while iterating reserved memblocks") Signed-off-by: Wende Tan <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent b75db25 commit da2d488

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/riscv/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ static void __init init_resources(void)
231231

232232
/* Clean-up any unused pre-allocated resources */
233233
mem_res_sz = (num_resources - res_idx + 1) * sizeof(*mem_res);
234-
memblock_free((phys_addr_t) mem_res, mem_res_sz);
234+
memblock_free(__pa(mem_res), mem_res_sz);
235235
return;
236236

237237
error:
238238
/* Better an empty resource tree than an inconsistent one */
239239
release_child_resources(&iomem_resource);
240-
memblock_free((phys_addr_t) mem_res, mem_res_sz);
240+
memblock_free(__pa(mem_res), mem_res_sz);
241241
}
242242

243243

0 commit comments

Comments
 (0)