diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
| commit | 268603d79cc48dba671e9caf108fab32315b86a2 (patch) | |
| tree | 77466c8c4c104397d1c459674f7a75c4fd60455a /arch/riscv/kernel/cpu_ops.c | |
| parent | 8c78c1e52b0b86bd282c41f3725beabe3c244b94 (diff) | |
| parent | 4c2d0b039c5cc0112206a5b22431b577cb1c57ad (diff) | |
| download | linux-268603d79cc48dba671e9caf108fab32315b86a2.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/riscv/kernel/cpu_ops.c')
| -rw-r--r-- | arch/riscv/kernel/cpu_ops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/riscv/kernel/cpu_ops.c b/arch/riscv/kernel/cpu_ops.c index 170d07e57721..8275f237a59d 100644 --- a/arch/riscv/kernel/cpu_ops.c +++ b/arch/riscv/kernel/cpu_ops.c @@ -9,15 +9,14 @@ #include <linux/string.h> #include <linux/sched.h> #include <asm/cpu_ops.h> +#include <asm/cpu_ops_sbi.h> #include <asm/sbi.h> #include <asm/smp.h> const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init; extern const struct cpu_operations cpu_ops_sbi; -#ifdef CONFIG_RISCV_BOOT_SPINWAIT -extern const struct cpu_operations cpu_ops_spinwait; -#else +#ifndef CONFIG_RISCV_BOOT_SPINWAIT const struct cpu_operations cpu_ops_spinwait = { .name = "", .cpu_prepare = NULL, |