diff options
| author | Mark Brown | 2015-04-08 21:04:25 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-04-08 21:04:25 +0100 |
| commit | 89cda06d7f9c3c111a81fcdf5464926f5f984ebc (patch) | |
| tree | bfa46c20c325feccd9de1a293e11686981d63e7b /arch/arm/kvm/trace.h | |
| parent | ede8342bf63166e8d8fc3c05fc0985b27cc8186b (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into spi-img-spfi
Linux 4.0-rc7
Diffstat (limited to 'arch/arm/kvm/trace.h')
| -rw-r--r-- | arch/arm/kvm/trace.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h index 881874b1a036..6817664b46b8 100644 --- a/arch/arm/kvm/trace.h +++ b/arch/arm/kvm/trace.h @@ -25,18 +25,22 @@ TRACE_EVENT(kvm_entry, ); TRACE_EVENT(kvm_exit, - TP_PROTO(unsigned long vcpu_pc), - TP_ARGS(vcpu_pc), + TP_PROTO(unsigned int exit_reason, unsigned long vcpu_pc), + TP_ARGS(exit_reason, vcpu_pc), TP_STRUCT__entry( + __field( unsigned int, exit_reason ) __field( unsigned long, vcpu_pc ) ), TP_fast_assign( + __entry->exit_reason = exit_reason; __entry->vcpu_pc = vcpu_pc; ), - TP_printk("PC: 0x%08lx", __entry->vcpu_pc) + TP_printk("HSR_EC: 0x%04x, PC: 0x%08lx", + __entry->exit_reason, + __entry->vcpu_pc) ); TRACE_EVENT(kvm_guest_fault, |