2023-07-24 12:34:29

by Arnd Bergmann

Subject: [PATCH] KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype

From: Arnd Bergmann <[email protected]>

The kvm_host_psci_cpu_entry() function was renamed in order to add a wrapper around
it, but the prototype did not change, so now the missing-prototype warning came
back in W=1 builds:

arch/arm64/kvm/hyp/nvhe/psci-relay.c:203:28: error: no previous prototype for function '__kvm_host_psci_cpu_entry' [-Werror,-Wmissing-prototypes]
asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on)

Fixes: dcf89d1111995 ("KVM: arm64: Add missing BTI instructions")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm64/include/asm/kvm_asm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index 7d170aaa2db41..24e28bb2d95b6 100644
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -278,7 +278,7 @@ asmlinkage void __noreturn hyp_panic_bad_stack(void);
asmlinkage void kvm_unexpected_el2_exception(void);
struct kvm_cpu_context;
void handle_trap(struct kvm_cpu_context *host_ctxt);
-asmlinkage void __noreturn kvm_host_psci_cpu_entry(bool is_cpu_on);
+asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on);
void __noreturn __pkvm_init_finalise(void);
void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc);
void kvm_patch_vector_branch(struct alt_instr *alt,
--
2.39.2

2023-07-26 08:02:53

by Marc Zyngier

Subject: Re: [PATCH] KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype

On Mon, 24 Jul 2023 13:18:42 +0100,
Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> The kvm_host_psci_cpu_entry() function was renamed in order to add a wrapper around
> it, but the prototype did not change, so now the missing-prototype warning came
> back in W=1 builds:
>
> arch/arm64/kvm/hyp/nvhe/psci-relay.c:203:28: error: no previous prototype for function '__kvm_host_psci_cpu_entry' [-Werror,-Wmissing-prototypes]
> asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on)
>
> Fixes: dcf89d1111995 ("KVM: arm64: Add missing BTI instructions")
> Signed-off-by: Arnd Bergmann <[email protected]>

Acked-by: Marc Zyngier <[email protected]>

M.

--
Without deviation from the norm, progress is not possible.

2023-07-26 20:13:22

by Oliver Upton

Subject: Re: [PATCH] KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype

On Mon, 24 Jul 2023 14:18:42 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The kvm_host_psci_cpu_entry() function was renamed in order to add a wrapper around
> it, but the prototype did not change, so now the missing-prototype warning came
> back in W=1 builds:
>
> arch/arm64/kvm/hyp/nvhe/psci-relay.c:203:28: error: no previous prototype for function '__kvm_host_psci_cpu_entry' [-Werror,-Wmissing-prototypes]
> asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on)
>
> [...]

Applied to kvmarm/fixes, thanks!

[1/1] KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype
https://git.kernel.org/kvmarm/kvmarm/c/01b94b0f3922

--
Best,
Oliver