From: Marc Zyngier <maz@kernel.org>
Date: Fri, 8 Nov 2019 11:27:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
X-Git-Tag: v5.15~4838^2~3^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd7056ae34af0e9424da97bbc7d2b38246ba8a2c;p=platform%2Fkernel%2Flinux-starfive.git

Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
---

cd7056ae34af0e9424da97bbc7d2b38246ba8a2c
diff --cc virt/kvm/arm/arm.c
index c11d661,dac96e3..12e0280
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@@ -408,13 -384,11 +412,13 @@@ void kvm_arch_vcpu_load(struct kvm_vcp
  	kvm_vcpu_load_sysregs(vcpu);
  	kvm_arch_vcpu_load_fp(vcpu);
  	kvm_vcpu_pmu_restore_guest(vcpu);
 +	if (kvm_arm_is_pvtime_enabled(&vcpu->arch))
 +		kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu);
  
  	if (single_task_running())
- 		vcpu_clear_wfe_traps(vcpu);
+ 		vcpu_clear_wfx_traps(vcpu);
  	else
- 		vcpu_set_wfe_traps(vcpu);
+ 		vcpu_set_wfx_traps(vcpu);
  
  	vcpu_ptrauth_setup_lazy(vcpu);
  }