diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 09:03:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 09:03:10 +0800 |
| commit | 47bbd44e18034d3277a29459d1f0c45e8d1c8d3e (patch) | |
| tree | 3ebdf7ef86be88fe0fbfeb378dc949ea59125d16 /arch/mips | |
| parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) | |
| parent | 8a5f782c33c04ea5c9b3ca6fb32d6039e2e5c0c9 (diff) | |
Merge tag 'v3.14.36' into linux-linaro-lsk-v3.14
This is the 3.14.36 stable release
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kvm/trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kvm/trace.h b/arch/mips/kvm/trace.h index bc9e0f406c08..e51621e36152 100644 --- a/arch/mips/kvm/trace.h +++ b/arch/mips/kvm/trace.h @@ -26,18 +26,18 @@ TRACE_EVENT(kvm_exit, TP_PROTO(struct kvm_vcpu *vcpu, unsigned int reason), TP_ARGS(vcpu, reason), TP_STRUCT__entry( - __field(struct kvm_vcpu *, vcpu) + __field(unsigned long, pc) __field(unsigned int, reason) ), TP_fast_assign( - __entry->vcpu = vcpu; + __entry->pc = vcpu->arch.pc; __entry->reason = reason; ), TP_printk("[%s]PC: 0x%08lx", kvm_mips_exit_types_str[__entry->reason], - __entry->vcpu->arch.pc) + __entry->pc) ); #endif /* _TRACE_KVM_H */ |