drivers/scsi/qla2xxx/qla_os.c | 2 +- include/linux/ring_buffer.h | 1 + include/linux/trace.h | 4 +- include/linux/trace_seq.h | 9 +- kernel/trace/ring_buffer.c | 321 +++++++++------------ kernel/trace/trace.c | 79 +++-- kernel/trace/trace.h | 1 + kernel/trace/trace_boot.c | 2 +- kernel/trace/trace_events.c | 48 ++- kernel/trace/trace_seq.c | 3 - samples/ftrace/sample-trace-array.c | 2 +- .../ftrace/test.d/00basic/trace_marker.tc | 82 ++++++ 12 files changed, 328 insertions(+), 226 deletions(-) create mode 100755 tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc