include/linux/seq_buf.h | 2 + kernel/trace/ring_buffer.c | 21 +++- kernel/trace/trace_events_user.c | 126 +++++++++++++++++++--- kernel/trace/trace_output.c | 15 ++- lib/seq_buf.c | 32 ++++++ scripts/recordmcount.c | 6 +- tools/testing/selftests/user_events/abi_test.c | 9 +- tools/testing/selftests/user_events/ftrace_test.c | 14 ++- 8 files changed, 198 insertions(+), 27 deletions(-)