Merge 4a8840af ("tracepoints: Use new static branch API") into android-mainline
Steps on the way to 6.13-rc1
Change-Id: If6467523b899d96db554e567fbabf90240db2a82
Signed-off-by:
Greg Kroah-Hartman <gregkh@google.com>
No related branches found
No related tags found
Showing
- include/linux/trace_events.h 0 additions, 4 deletionsinclude/linux/trace_events.h
- include/linux/tracepoint-defs.h 2 additions, 2 deletionsinclude/linux/tracepoint-defs.h
- include/linux/tracepoint.h 4 additions, 4 deletionsinclude/linux/tracepoint.h
- kernel/trace/trace.c 9 additions, 35 deletionskernel/trace/trace.c
- kernel/trace/trace.h 0 additions, 4 deletionskernel/trace/trace.h
- kernel/trace/trace_branch.c 3 additions, 7 deletionskernel/trace/trace_branch.c
- kernel/trace/trace_events.c 0 additions, 2 deletionskernel/trace/trace_events.c
- kernel/trace/trace_events_hist.c 1 addition, 1 deletionkernel/trace/trace_events_hist.c
- kernel/trace/trace_events_user.c 2 additions, 2 deletionskernel/trace/trace_events_user.c
- kernel/trace/trace_functions.c 3 additions, 7 deletionskernel/trace/trace_functions.c
- kernel/trace/trace_functions_graph.c 2 additions, 6 deletionskernel/trace/trace_functions_graph.c
- kernel/trace/trace_hwlat.c 1 addition, 3 deletionskernel/trace/trace_hwlat.c
- kernel/trace/trace_mmiotrace.c 2 additions, 6 deletionskernel/trace/trace_mmiotrace.c
- kernel/trace/trace_osnoise.c 3 additions, 9 deletionskernel/trace/trace_osnoise.c
- kernel/trace/trace_sched_wakeup.c 2 additions, 6 deletionskernel/trace/trace_sched_wakeup.c
- kernel/tracepoint.c 2 additions, 2 deletionskernel/tracepoint.c
Loading
Please register or sign in to comment