diff options
author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-12-02 09:27:51 -0500 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-12-13 08:15:25 -0500 |
commit | 03f1d4c17edb31b41b14ca3a749ae38d2dd6639d (patch) | |
tree | ab10f7288b4405beb79d015592fdbf1b1725c6c8 /arch/arm | |
parent | 016ed39c54b8a3db680e5c6a43419f806133caf2 (diff) |
arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag
If a VCPU was originally started with power off (typically to be brought
up by PSCI in SMP configurations), there is no need to clear the
POWER_OFF flag in the kernel, as this flag is only tested during the
init ioctl itself.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kvm/arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9e193c8a959e..b160beadc956 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -661,7 +661,7 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, | |||
661 | /* | 661 | /* |
662 | * Handle the "start in power-off" case by marking the VCPU as paused. | 662 | * Handle the "start in power-off" case by marking the VCPU as paused. |
663 | */ | 663 | */ |
664 | if (__test_and_clear_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) | 664 | if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) |
665 | vcpu->arch.pause = true; | 665 | vcpu->arch.pause = true; |
666 | 666 | ||
667 | return 0; | 667 | return 0; |