git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: f6a694665f132cbf6e2222dd2f173dc35330a8aa
Arnd Bergmann (1):
seq_buf: Avoid type mismatch for seq_buf_init
Lukas Bulwahn (2):
ring-buffer: Remove obsolete rb_event_is_commit()
tracing: Drop unneeded assignment in ring_buffer_resize()
Masami Hiramatsu (1):
tracing: Disable ftrace selftests when any tracer is running
Qiujun Huang (3):
ring-buffer: Fix a typo in function description
ring-buffer: Fix two typos in comments
ring-buffer: Add rb_check_bpage in __rb_allocate_pages
Steven Rostedt (VMware) (2):
Revert: "ring-buffer: Remove HAVE_64BIT_ALIGNED_ACCESS"
tracing: Offload eval map updates to a work queue
----
arch/Kconfig | 16 ++++++++++++
include/linux/seq_buf.h | 2 +-
include/linux/trace_seq.h | 4 +--
kernel/trace/ring_buffer.c | 61 +++++++++++++++++++------------------------
kernel/trace/trace.c | 51 +++++++++++++++++++++++++++++++-----
kernel/trace/trace.h | 5 ++++
kernel/trace/trace_boot.c | 2 ++
kernel/trace/trace_events.c | 2 +-
kernel/trace/trace_kprobe.c | 9 +++----
kernel/trace/trace_selftest.c | 2 +-
10 files changed, 102 insertions(+), 52 deletions(-)
