diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-30 09:48:30 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 09:48:30 +0100 |
| commit | 816c347f3a48fb15370b23664760ea61286fea05 (patch) | |
| tree | 7eb7f4f7e1e944eaa1f5ac34fd68fa3570cc8ccf /arch/arm64/kvm/hyp/vhe | |
| parent | a3bb9c3a00551726590137e3974495ce6cf6b758 (diff) | |
| parent | 780c083a8f840ca9162c7a4090ff5e10d15152a2 (diff) | |
| download | linux-816c347f3a48fb15370b23664760ea61286fea05.tar.bz2 | |
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/hyp/vhe')
| -rw-r--r-- | arch/arm64/kvm/hyp/vhe/switch.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c index 0949fc97bf03..a8d407532798 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -134,8 +134,6 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) sysreg_restore_guest_state_vhe(guest_ctxt); __debug_switch_to_guest(vcpu); - __set_guest_arch_workaround_state(vcpu); - do { /* Jump in the fire! */ exit_code = __guest_enter(vcpu, host_ctxt); @@ -143,8 +141,6 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) /* And we're baaack! */ } while (fixup_guest_exit(vcpu, &exit_code)); - __set_host_arch_workaround_state(vcpu); - sysreg_save_guest_state_vhe(guest_ctxt); __deactivate_traps(vcpu); |