diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-05 17:16:13 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-05 17:16:13 +1100 |
| commit | d4e09f8432a428d6a46ca4f3c2b28d0385f5b93d (patch) | |
| tree | c5d7ef8e5a9e69e011e6361f076b43d3e3767575 /arch/powerpc/kvm/trace.h | |
| parent | 41c8c46bfe52488779e227b77222402579573ccf (diff) | |
| parent | 544c6761bb05a1dd19a39cb9bed096273f9bdb36 (diff) | |
| download | op-kernel-dev-d4e09f8432a428d6a46ca4f3c2b28d0385f5b93d.zip op-kernel-dev-d4e09f8432a428d6a46ca4f3c2b28d0385f5b93d.tar.gz | |
Merge branch 'kvm' into next
Diffstat (limited to 'arch/powerpc/kvm/trace.h')
| -rw-r--r-- | arch/powerpc/kvm/trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index 67f219d..a8e8400 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -12,8 +12,8 @@ * Tracepoint for guest mode entry. */ TRACE_EVENT(kvm_ppc_instr, - TP_PROTO(unsigned int inst, unsigned long pc, unsigned int emulate), - TP_ARGS(inst, pc, emulate), + TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate), + TP_ARGS(inst, _pc, emulate), TP_STRUCT__entry( __field( unsigned int, inst ) @@ -23,7 +23,7 @@ TRACE_EVENT(kvm_ppc_instr, TP_fast_assign( __entry->inst = inst; - __entry->pc = pc; + __entry->pc = _pc; __entry->emulate = emulate; ), |
