Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace',...
Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core
No related branches found
No related tags found
Showing
- arch/arm/include/asm/ftrace.h 5 additions, 0 deletionsarch/arm/include/asm/ftrace.h
- arch/powerpc/include/asm/ftrace.h 5 additions, 0 deletionsarch/powerpc/include/asm/ftrace.h
- arch/sh/include/asm/ftrace.h 5 additions, 0 deletionsarch/sh/include/asm/ftrace.h
- arch/sparc/include/asm/ftrace.h 5 additions, 0 deletionsarch/sparc/include/asm/ftrace.h
- arch/x86/Kconfig.debug 0 additions, 4 deletionsarch/x86/Kconfig.debug
- arch/x86/include/asm/ftrace.h 15 additions, 0 deletionsarch/x86/include/asm/ftrace.h
- arch/x86/kernel/ftrace.c 128 additions, 1 deletionarch/x86/kernel/ftrace.c
- arch/x86/mm/Makefile 1 addition, 2 deletionsarch/x86/mm/Makefile
- arch/x86/mm/fault.c 1 addition, 1 deletionarch/x86/mm/fault.c
- include/linux/ftrace.h 3 additions, 0 deletionsinclude/linux/ftrace.h
- include/linux/hardirq.h 13 additions, 2 deletionsinclude/linux/hardirq.h
- include/linux/marker.h 0 additions, 2 deletionsinclude/linux/marker.h
- include/linux/tracepoint.h 4 additions, 0 deletionsinclude/linux/tracepoint.h
- kernel/marker.c 28 additions, 52 deletionskernel/marker.c
- kernel/trace/Kconfig 1 addition, 1 deletionkernel/trace/Kconfig
- kernel/trace/trace.c 25 additions, 7 deletionskernel/trace/trace.c
- kernel/tracepoint.c 159 additions, 102 deletionskernel/tracepoint.c
Loading
Please register or sign in to comment