diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-30 10:48:30 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 10:48:30 +0200 |
| commit | 816c347f3a48fb15370b23664760ea61286fea05 (patch) | |
| tree | 7eb7f4f7e1e944eaa1f5ac34fd68fa3570cc8ccf /arch/arm64/kvm/reset.c | |
| parent | kvm: arm64: Remove unnecessary hyp mappings (diff) | |
| parent | arm64: Add support for PR_SPEC_DISABLE_NOEXEC prctl() option (diff) | |
| download | linux-816c347f3a48fb15370b23664760ea61286fea05.tar.xz linux-816c347f3a48fb15370b23664760ea61286fea05.zip | |
Merge remote-tracking branch 'arm64/for-next/ghostbusters' into kvm-arm64/hyp-pcpu
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 ee33875c5c2a..f6e8b4a75cbb 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: |