Merge remote-tracking branch 'y2038/y2038'

[karo-tx-linux.git] / arch / arm / kvm / psci.c

diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
index ad6f6424f1d1b3aac2b94792178bd2d41fed3f97..0b556968a6da1e97e4b6232d1dd8e588a13bfa9e 100644 (file)
--- a/arch/arm/kvm/psci.c
+++ b/arch/arm/kvm/psci.c
@@ -63,7 +63,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu)
 
 static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu)
 {
-       vcpu->arch.pause = true;
+       vcpu->arch.power_off = true;
 }
 
 static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
@@ -87,7 +87,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
         */
        if (!vcpu)
                return PSCI_RET_INVALID_PARAMS;
-       if (!vcpu->arch.pause) {
+       if (!vcpu->arch.power_off) {
                if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1)
                        return PSCI_RET_ALREADY_ON;
                else
@@ -115,7 +115,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
         * the general puspose registers are undefined upon CPU_ON.
         */
        *vcpu_reg(vcpu, 0) = context_id;
-       vcpu->arch.pause = false;
+       vcpu->arch.power_off = false;
        smp_mb();               /* Make sure the above is visible */
 
        wq = kvm_arch_vcpu_wq(vcpu);
@@ -153,7 +153,7 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu)
                mpidr = kvm_vcpu_get_mpidr_aff(tmp);
                if ((mpidr & target_affinity_mask) == target_affinity) {
                        matching_cpus++;
-                       if (!tmp->arch.pause)
+                       if (!tmp->arch.power_off)
                                return PSCI_0_2_AFFINITY_LEVEL_ON;
                }
        }
@@ -179,7 +179,7 @@ static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)
         * re-initialized.
         */
        kvm_for_each_vcpu(i, tmp, vcpu->kvm) {
-               tmp->arch.pause = true;
+               tmp->arch.power_off = true;
                kvm_vcpu_kick(tmp);
        }