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

diff --cc arch/arm/include/asm/kvm_emulate.h
Simple merge

diff --cc arch/arm/kvm/guest.c
Simple merge

diff --cc arch/arm64/include/asm/kvm_emulate.h
Simple merge

diff --cc arch/arm64/kvm/guest.c
Simple merge

diff --cc virt/kvm/arm/arm.c
index c11d6613f4ee50ad4bdbcdb267058ff163338a03,dac96e355f69cbd7e1327579ca481ac8ef24a6aa..12e0280291cee9c0670f0d5c222ff6f24e4c0060
--- 1/virt/kvm/arm/arm.c
--- 2/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);
  }