diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
commit | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (patch) | |
tree | a9655fcdd65c2068cc04ffe3562a9c710dfa2145 /arch/x86/kvm/svm.c | |
parent | b0e4376b34cab1cbbd7ed399a1df787890336837 (diff) | |
parent | a26899e0baa4de07caf97f5e4d7298240e98fd0e (diff) |
Merge tag 'v4.14.52' into linux-linaro-lsk-v4.14lsk-v4.14-18.06
This is the 4.14.52 stable release
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 029aa1318874..cfa155078ebb 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4756,9 +4756,8 @@ static int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq, } if (!ret && svm) { - trace_kvm_pi_irte_update(svm->vcpu.vcpu_id, - host_irq, e->gsi, - vcpu_info.vector, + trace_kvm_pi_irte_update(host_irq, svm->vcpu.vcpu_id, + e->gsi, vcpu_info.vector, vcpu_info.pi_desc_addr, set); } |