OSDN Git Service

arm/arm64: KVM: Turn kvm_psci_version into a static inline
authorMark Rutland <mark.rutland@arm.com>
Thu, 12 Apr 2018 11:11:30 +0000 (12:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Apr 2018 06:21:05 +0000 (08:21 +0200)
commit142cfd60faba9cfa34adc1a3cf7e184a8066c12f
tree3a9abb8b30213e9d0818b888d12178663920561d
parentc482a245b9692d86d038262795caa998d852983f
arm/arm64: KVM: Turn kvm_psci_version into a static inline

From: Marc Zyngier <marc.zyngier@arm.com>

commit a4097b351118e821841941a79ec77d3ce3f1c5d9 upstream.

We're about to need kvm_psci_version in HYP too. So let's turn it
into a static inline, and pass the kvm structure as a second
parameter (so that HYP can do a kern_hyp_va on it).

Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
[v4.9: account for files moved to virt/ upstream]
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/kvm/psci.c
arch/arm64/kvm/hyp/switch.c
include/kvm/arm_psci.h