Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger...

[firefly-linux-kernel-4.4.55.git] / arch / arm / kvm / handle_exit.c

diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
index a96a8043277c3de69cc460a5b2a3f83a36fc30ed..95f12b2ccdcb8172e4faa4f7148438ec27f08f1a 100644 (file)
--- a/arch/arm/kvm/handle_exit.c
+++ b/arch/arm/kvm/handle_exit.c
@@ -87,11 +87,13 @@ static int handle_dabt_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)
  */
 static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
-       trace_kvm_wfi(*vcpu_pc(vcpu));
-       if (kvm_vcpu_get_hsr(vcpu) & HSR_WFI_IS_WFE)
+       if (kvm_vcpu_get_hsr(vcpu) & HSR_WFI_IS_WFE) {
+               trace_kvm_wfx(*vcpu_pc(vcpu), true);
                kvm_vcpu_on_spin(vcpu);
-       else
+       } else {
+               trace_kvm_wfx(*vcpu_pc(vcpu), false);
                kvm_vcpu_block(vcpu);
+       }
 
        kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));