Merge tag 'microblaze-v5.19' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / arch / powerpc / kvm / trace_hv.h

diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h
index 38cd0ed..32e2cb5 100644 (file)
--- a/arch/powerpc/kvm/trace_hv.h
+++ b/arch/powerpc/kvm/trace_hv.h
@@ -409,9 +409,9 @@ TRACE_EVENT(kvmppc_run_core,
 );
 
 TRACE_EVENT(kvmppc_vcore_blocked,
-       TP_PROTO(struct kvmppc_vcore *vc, int where),
+       TP_PROTO(struct kvm_vcpu *vcpu, int where),
 
-       TP_ARGS(vc, where),
+       TP_ARGS(vcpu, where),
 
        TP_STRUCT__entry(
                __field(int,    n_runnable)
@@ -421,8 +421,8 @@ TRACE_EVENT(kvmppc_vcore_blocked,
        ),
 
        TP_fast_assign(
-               __entry->runner_vcpu = vc->runner->vcpu_id;
-               __entry->n_runnable  = vc->n_runnable;
+               __entry->runner_vcpu = vcpu->vcpu_id;
+               __entry->n_runnable  = vcpu->arch.vcore->n_runnable;
                __entry->where       = where;
                __entry->tgid        = current->tgid;
        ),