diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 15:09:35 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 15:09:35 +0300 |
| commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
| tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /drivers/cpuidle | |
| parent | f06351f8c0c85e2d53e73c53a33b4ef55b4ad6de (diff) | |
| parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) | |
| download | linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.xz | |
Merge tag 'v5.18-rc4' into next
Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
Diffstat (limited to 'drivers/cpuidle')
| -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" |