diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-22 23:53:14 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-22 23:53:14 +0300 |
commit | 4e339e5e2dbf91e6499ef65389035b2795518c3d (patch) | |
tree | ababfba6f8face7a1452da34a3e32450dbf119c8 /drivers | |
parent | 7200095feadfb9792b744a5a6e20249ce77bc6d7 (diff) | |
parent | bf9bac40b7635e2ce43ba0051a64c3fd44312405 (diff) | |
download | linux-4e339e5e2dbf91e6499ef65389035b2795518c3d.tar.xz |
Merge tag 'riscv-for-linus-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes Palmer Dabbelt:
- A pair of build fixes for the recent cpuidle driver
- A fix for systems without sv57 that manifests as a crash
early in boot
* tag 'riscv-for-linus-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
RISC-V: cpuidle: fix Kconfig select for RISCV_SBI_CPUIDLE
RISC-V: mm: Fix set_satp_mode() for platform not having Sv57
cpuidle: riscv: support non-SMP config
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/cpuidle/cpuidle-riscv-sbi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index b459eda2cd37..5c852e671992 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -22,6 +22,7 @@ #include <linux/pm_runtime.h> #include <asm/cpuidle.h> #include <asm/sbi.h> +#include <asm/smp.h> #include <asm/suspend.h> #include "dt_idle_states.h" |