@@ -43,17 +43,14 @@ TRACE_EVENT(irq_handler_entry,
TP_STRUCT__entry(
__field( int, irq )
__string( name, action->name )
- __field(void*, handler)
),
TP_fast_assign(
__entry->irq = irq;
__assign_str(name, action->name);
- __entry->handler = action->handler;
),
- TP_printk("irq=%d name=%s handler=%pf",
- __entry->irq, __get_str(name), __entry->handler)
+ TP_printk("irq=%d name=%s", __entry->irq, __get_str(name))
);
/**
@@ -43,17 +43,15 @@ DEFINE_EVENT(timer_class, timer_init,
*/
TRACE_EVENT(timer_start,
- TP_PROTO(struct timer_list *timer,
- unsigned long expires, char deferrable),
+ TP_PROTO(struct timer_list *timer, unsigned long expires),
- TP_ARGS(timer, expires, deferrable),
+ TP_ARGS(timer, expires),
TP_STRUCT__entry(
__field( void *, timer )
__field( void *, function )
__field( unsigned long, expires )
__field( unsigned long, now )
- __field(char, deferrable)
),
TP_fast_assign(
@@ -61,12 +59,11 @@ TRACE_EVENT(timer_start,
__entry->function = timer->function;
__entry->expires = expires;
__entry->now = jiffies;
- __entry->deferrable = deferrable;
),
- TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] defer=%c",
+ TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]",
__entry->timer, __entry->function, __entry->expires,
- (long)__entry->expires - __entry->now, __entry->deferrable)
+ (long)__entry->expires - __entry->now)
);
/**
@@ -584,8 +584,7 @@ static inline void
debug_activate(struct timer_list *timer, unsigned long expires)
{
debug_timer_activate(timer);
- trace_timer_start(timer, expires,
- tbase_get_deferrable(timer->base) > 0 ? 'y' : 'n');
+ trace_timer_start(timer, expires);
}
static inline void debug_deactivate(struct timer_list *timer)
From: Colin Ian King <colin.king@canonical.com> Revert trace event changes that deviate from upstream kernel to ensure the lttng DKMS module builds without failure. This removes some extra tracing information that we don't require and ensures that the tracing matches the upstream kernel. This reverts commit a2cd6eaf5deaa40098eb6b692797519bc173381e. --- include/trace/events/irq.h | 5 +---- include/trace/events/timer.h | 11 ++++------- kernel/timer.c | 3 +-- 3 files changed, 6 insertions(+), 13 deletions(-)