diff options
| author | Alexander Graf <agraf@suse.de> | 2009-10-30 05:47:25 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-05 16:50:27 +1100 |
| commit | 346b2762a72c60e97d2825e60423c84a869f3266 (patch) | |
| tree | 8b3a072b0233f337f4a234270359a4e6f079fdab | |
| parent | c4f9c779f1019c7d5c61961a7c0aaaf1420d8f90 (diff) | |
| download | kernel_samsung_smdk4412-346b2762a72c60e97d2825e60423c84a869f3266.zip kernel_samsung_smdk4412-346b2762a72c60e97d2825e60423c84a869f3266.tar.gz kernel_samsung_smdk4412-346b2762a72c60e97d2825e60423c84a869f3266.tar.bz2 | |
Fix trace.h
It looks like the variable "pc" is defined. At least the current code always
failed on me stating that "pc" is already defined somewhere else.
Let's use _pc instead, because that doesn't collide.
Is this the right approach? Does it break on 440 too? If not, why not?
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -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; ), |