diff mbox series

KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype

Message ID 20230724121850.1386668-1-arnd@kernel.org
State New
Headers
Series KVM: arm64: fix __kvm_host_psci_cpu_entry() prototype |

Commit Message

Arnd Bergmann July 24, 2023, 12:18 p.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

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 <arnd@arndb.de>
---
 arch/arm64/include/asm/kvm_asm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marc Zyngier July 26, 2023, 7:27 a.m. UTC | #1 
On Mon, 24 Jul 2023 13:18:42 +0100,
Arnd Bergmann <arnd@kernel.org> wrote:
> 
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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 <arnd@arndb.de>

Acked-by: Marc Zyngier <maz@kernel.org>

	M.
Oliver Upton July 26, 2023, 7:54 p.m. UTC | #2 
On Mon, 24 Jul 2023 14:18:42 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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
diff mbox series

Patch

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,