Documentation/trace/ftrace.rst | 3 -- include/linux/trace_events.h | 13 ------- include/linux/tracepoint-defs.h | 10 ++++-- include/linux/tracepoint.h | 44 ++++++++++++++++++++---- include/trace/define_trace.h | 2 +- kernel/debug/kdb/kdb_main.c | 69 ++++++++++---------------------------- kernel/trace/trace.c | 4 +-- kernel/trace/trace_events_filter.c | 8 ++--- kernel/trace/trace_events_hist.c | 4 +-- kernel/trace/trace_kdb.c | 13 +++---- kernel/trace/trace_output.c | 1 - kernel/trace/trace_sched_switch.c | 2 +- kernel/tracepoint.c | 20 ++++++----- 13 files changed, 89 insertions(+), 104 deletions(-)