diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-06 11:00:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-06 13:47:24 -0400 |
| commit | 98b35c7fdba4e813b2275ea5e6a34b67a66ea9c1 (patch) | |
| tree | 6ecc74e2b0039c8348ada10d4d15696d6577903b | |
| parent | b53ab97150314674edc25508f4fc528be2baa73f (diff) | |
| parent | 59d2a7d7317b02f8224b5cd207c3318662c7fe15 (diff) | |
Merge branch '2023-09-06-riscv-fixes' into next
- Merge two patches to fix the issues with risc-v building on next after
the merge of v2023.10-rc4 to next.
| -rw-r--r-- | arch/riscv/cpu/cpu.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index d64aa330f20..c1a9638c1ab 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -66,7 +66,7 @@ static inline bool supports_extension(char ext) #endif /* CONFIG_CPU */ } -static int riscv_cpu_probe(void *ctx, struct event *event) +static int riscv_cpu_probe(void) { #ifdef CONFIG_CPU int ret; @@ -79,7 +79,7 @@ static int riscv_cpu_probe(void *ctx, struct event *event) return 0; } -EVENT_SPY(EVT_DM_POST_INIT_R, riscv_cpu_probe); +EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_R, riscv_cpu_probe); /* * This is called on secondary harts just after the IPI is init'd. Currently @@ -94,11 +94,7 @@ static void dummy_pending_ipi_clear(ulong hart, ulong arg0, ulong arg1) int riscv_cpu_setup(void) { - int ret; - - ret = riscv_cpu_probe(ctx, event); - if (ret) - return ret; + int __maybe_unused ret; /* Enable FPU */ if (supports_extension('d') || supports_extension('f')) { |