From 789ff0c772c69be845660570177dabdc59187c97 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 22 May 2012 18:47:48 +0000 Subject: [PATCH] --- yaml --- r: 313629 b: refs/heads/master c: d136e27326a3bd50d7929a43c018abf13e426b7e h: refs/heads/master i: 313627: 248f13f4f8d98701edbbf4c39bc2108da70ea095 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/trace.h | 45 +++++++------------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/[refs] b/[refs] index 6dc6a1e3eeb3..e2fbf2a12a1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 641bd53a615b35d7a2e9a3de764e7c4953948679 +refs/heads/master: d136e27326a3bd50d7929a43c018abf13e426b7e diff --git a/trunk/arch/powerpc/include/asm/trace.h b/trunk/arch/powerpc/include/asm/trace.h index cbe2297d68b6..5712f06905a9 100644 --- a/trunk/arch/powerpc/include/asm/trace.h +++ b/trunk/arch/powerpc/include/asm/trace.h @@ -8,7 +8,7 @@ struct pt_regs; -TRACE_EVENT(irq_entry, +DECLARE_EVENT_CLASS(ppc64_interrupt_class, TP_PROTO(struct pt_regs *regs), @@ -25,55 +25,32 @@ TRACE_EVENT(irq_entry, TP_printk("pt_regs=%p", __entry->regs) ); -TRACE_EVENT(irq_exit, +DEFINE_EVENT(ppc64_interrupt_class, irq_entry, TP_PROTO(struct pt_regs *regs), - TP_ARGS(regs), - - TP_STRUCT__entry( - __field(struct pt_regs *, regs) - ), - - TP_fast_assign( - __entry->regs = regs; - ), - - TP_printk("pt_regs=%p", __entry->regs) + TP_ARGS(regs) ); -TRACE_EVENT(timer_interrupt_entry, +DEFINE_EVENT(ppc64_interrupt_class, irq_exit, TP_PROTO(struct pt_regs *regs), - TP_ARGS(regs), - - TP_STRUCT__entry( - __field(struct pt_regs *, regs) - ), - - TP_fast_assign( - __entry->regs = regs; - ), - - TP_printk("pt_regs=%p", __entry->regs) + TP_ARGS(regs) ); -TRACE_EVENT(timer_interrupt_exit, +DEFINE_EVENT(ppc64_interrupt_class, timer_interrupt_entry, TP_PROTO(struct pt_regs *regs), - TP_ARGS(regs), + TP_ARGS(regs) +); - TP_STRUCT__entry( - __field(struct pt_regs *, regs) - ), +DEFINE_EVENT(ppc64_interrupt_class, timer_interrupt_exit, - TP_fast_assign( - __entry->regs = regs; - ), + TP_PROTO(struct pt_regs *regs), - TP_printk("pt_regs=%p", __entry->regs) + TP_ARGS(regs) ); #ifdef CONFIG_PPC_PSERIES