Merge branch 'tracing/ftrace' into auto-ftrace-next
Showing
- include/linux/ftrace.h 1 addition, 0 deletionsinclude/linux/ftrace.h
- kernel/Makefile 1 addition, 1 deletionkernel/Makefile
- kernel/trace/ftrace.c 17 additions, 0 deletionskernel/trace/ftrace.c
- kernel/trace/trace.c 20 additions, 4 deletionskernel/trace/trace.c
- kernel/trace/trace.h 8 additions, 2 deletionskernel/trace/trace.h
- kernel/trace/trace_functions.c 3 additions, 0 deletionskernel/trace/trace_functions.c
- kernel/trace/trace_sched_switch.c 2 additions, 2 deletionskernel/trace/trace_sched_switch.c
- kernel/trace/trace_sched_wakeup.c 2 additions, 1 deletionkernel/trace/trace_sched_wakeup.c
Loading
Please register or sign in to comment