diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
| commit | 14ef9d04928b61d699fd0dd858b14b5d8150113e (patch) | |
| tree | 267d772b7068f7d0da04cf421286c65f2599f472 /arch/arm64/kvm/reset.c | |
| parent | 2e02cbb236d6ac12e04629f94b7032a94f968165 (diff) | |
| parent | 816c347f3a48fb15370b23664760ea61286fea05 (diff) | |
| download | linux-14ef9d04928b61d699fd0dd858b14b5d8150113e.tar.gz linux-14ef9d04928b61d699fd0dd858b14b5d8150113e.tar.bz2 linux-14ef9d04928b61d699fd0dd858b14b5d8150113e.zip | |
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/reset.c')
| -rw-r--r-- | arch/arm64/kvm/reset.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 2202b710d44c..f32490229a4c 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -319,10 +319,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) vcpu->arch.reset_state.reset = false; } - /* Default workaround setup is enabled (if supported) */ - if (kvm_arm_have_ssbd() == KVM_SSBD_KERNEL) - vcpu->arch.workaround_flags |= VCPU_WORKAROUND_2_FLAG; - /* Reset timer */ ret = kvm_timer_vcpu_reset(vcpu); out: |