diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2018-02-06 17:56:09 +0000 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-02-06 22:53:56 +0000 |
commit | d0a144f12a7ca8368933eae6583c096c363ec506 (patch) | |
tree | 9cfb945f9b554eba767ec62bd61d901beb596f0f /virt | |
parent | 1a2fb94e6a771ff94f4afa22497a4695187b820c (diff) | |
download | linux-stable-d0a144f12a7ca8368933eae6583c096c363ec506.tar.gz linux-stable-d0a144f12a7ca8368933eae6583c096c363ec506.tar.bz2 linux-stable-d0a144f12a7ca8368933eae6583c096c363ec506.zip |
arm/arm64: KVM: Add PSCI_VERSION helper
As we're about to trigger a PSCI version explosion, it doesn't
hurt to introduce a PSCI_VERSION helper that is going to be
used everywhere.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/arm/psci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index b322e46fd142..999f94d6bb98 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -25,8 +25,6 @@ #include <kvm/arm_psci.h> -#include <uapi/linux/psci.h> - /* * This is an implementation of the Power State Coordination Interface * as described in ARM document number ARM DEN 0022A. @@ -222,7 +220,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) * Bits[31:16] = Major Version = 0 * Bits[15:0] = Minor Version = 2 */ - val = 2; + val = KVM_ARM_PSCI_0_2; break; case PSCI_0_2_FN_CPU_SUSPEND: case PSCI_0_2_FN64_CPU_SUSPEND: |