diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index bb70f46656b2..eeceafaaea4c 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -160,51 +160,6 @@ DEFINE_EVENT(softirq, softirq_raise, TP_ARGS(vec_nr) ); -DECLARE_EVENT_CLASS(tasklet, - - TP_PROTO(void *func), - - TP_ARGS(func), - - TP_STRUCT__entry( - __field( void *, func) - ), - - TP_fast_assign( - __entry->func = func; - ), - - TP_printk("function=%ps", __entry->func) -); - -DEFINE_EVENT(tasklet, tasklet_entry, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_exit, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_hi_entry, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - -DEFINE_EVENT(tasklet, tasklet_hi_exit, - - TP_PROTO(void *func), - - TP_ARGS(func) -); - #endif /* _TRACE_IRQ_H */ /* This part must be outside protection */ diff --git a/kernel/softirq.c b/kernel/softirq.c index f0fa261746fa..a04000169623 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -562,15 +562,10 @@ static void tasklet_action_common(struct softirq_action *a, if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) BUG(); - if (t->use_callback) { - trace_tasklet_entry(t->callback); + if (t->use_callback) t->callback(t); - trace_tasklet_exit(t->callback); - } else { - trace_tasklet_entry(t->func); + else t->func(t->data); - trace_tasklet_exit(t->func); - } tasklet_unlock(t); continue; }