arm/arm64: KVM: Turn kvm_psci_version into a static inline
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 6 Feb 2018 17:56:13 +0000 (17:56 +0000)
committerHaibo Chen <haibo.chen@nxp.com>
Thu, 12 Apr 2018 10:46:32 +0000 (18:46 +0800)
commit56ebd7307e0fe8b230011eb911fc8b38f9d51d09
treed3d39329fad750c9de4c1bbf36573e8e7fbfafd0
parent6c8074e77cf469b8a45bb49e0a1654d3b52257b5
arm/arm64: KVM: Turn kvm_psci_version into a static inline

commit a4097b351118 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>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
mv changes from virt/kvm/arm/psci.c to arch/arm/kvm/psci.c
arch/arm/kvm/psci.c
arch/arm64/kvm/hyp/switch.c
include/kvm/arm_psci.h