diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 21:52:58 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 21:52:58 +1100 |
| commit | 2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch) | |
| tree | 41de92d988a4deccb2d5087a964a51682f155e99 /arch/powerpc/include/asm/trace.h | |
| parent | powerpc: Fix BUG_ON() reporting in real mode (diff) | |
| parent | powerpc/mm/hash: Clear the invalid slot information correctly (diff) | |
| download | wireguard-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.xz wireguard-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.zip | |
Merge tag 'powerpc-4.5-4' into next
Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.
Diffstat (limited to 'arch/powerpc/include/asm/trace.h')
| -rw-r--r-- | arch/powerpc/include/asm/trace.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/trace.h b/arch/powerpc/include/asm/trace.h index 8e86b48d0369..32e36b16773f 100644 --- a/arch/powerpc/include/asm/trace.h +++ b/arch/powerpc/include/asm/trace.h @@ -57,12 +57,14 @@ DEFINE_EVENT(ppc64_interrupt_class, timer_interrupt_exit, extern void hcall_tracepoint_regfunc(void); extern void hcall_tracepoint_unregfunc(void); -TRACE_EVENT_FN(hcall_entry, +TRACE_EVENT_FN_COND(hcall_entry, TP_PROTO(unsigned long opcode, unsigned long *args), TP_ARGS(opcode, args), + TP_CONDITION(cpu_online(raw_smp_processor_id())), + TP_STRUCT__entry( __field(unsigned long, opcode) ), @@ -76,13 +78,15 @@ TRACE_EVENT_FN(hcall_entry, hcall_tracepoint_regfunc, hcall_tracepoint_unregfunc ); -TRACE_EVENT_FN(hcall_exit, +TRACE_EVENT_FN_COND(hcall_exit, TP_PROTO(unsigned long opcode, unsigned long retval, unsigned long *retbuf), TP_ARGS(opcode, retval, retbuf), + TP_CONDITION(cpu_online(raw_smp_processor_id())), + TP_STRUCT__entry( __field(unsigned long, opcode) __field(unsigned long, retval) |