diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-21 11:04:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-21 11:04:26 -0700 |
| commit | a09434f181f3ae3a0a6a42bfcf0dc375f0eb26a2 (patch) | |
| tree | daa96f01ca3ac49d979d7699e44e01d7d0f91f7e /arch/riscv | |
| parent | 5479a7fe89664b526d21cd62dac5dfe017e0ebd3 (diff) | |
| parent | aa3e1ba32e553e611a58145c2eb349802feaa6eb (diff) | |
Merge tag 'riscv-for-linus-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- fix the sifive-l2-cache device tree bindings for json-schema
compatibility. This does not change the intended behavior of the
binding.
- avoid improperly freeing necessary resources during early boot.
* tag 'riscv-for-linus-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: Fix a number of free'd resources in init_resources()
dt-bindings: sifive-l2-cache: Fix 'select' matching
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 18bd0e4bc36c..120b2f6f71bc 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -229,8 +229,8 @@ static void __init init_resources(void) } /* Clean-up any unused pre-allocated resources */ - mem_res_sz = (num_resources - res_idx + 1) * sizeof(*mem_res); - memblock_free(__pa(mem_res), mem_res_sz); + if (res_idx >= 0) + memblock_free(__pa(mem_res), (res_idx + 1) * sizeof(*mem_res)); return; error: |