Ingo, This should be my last set of changes for the next merge window. Please pull the latest tip/perf/core tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git tip/perf/core Head SHA1: b732d439cb43336cd6d7e804ecb2c81193ef63b0 Namhyung Kim (1): tracing: Check return value of tracing_dentry_percpu() Steven Rostedt (11): tracing: Clean up tracing_mark_write() ring-buffer: Add integrity check at end of iter read ring-buffer: Reset head page before running self test ftrace: Sort all function addresses, not just per page ftrace: Remove extra helper functions ftrace: Speed up search by skipping pages by address ftrace: Consolidate ftrace_location() and ftrace_text_reserved() ftrace: Return record ip addr for ftrace_location() ftrace: Make ftrace_modify_all_code() global for archs to use ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code() ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER Vaibhav Nagarnaik (3): ring-buffer: Make removal of ring buffer pages atomic ring-buffer: Make addition of pages in ring buffer atomic tracing: change CPU ring buffer state from tracing_cpumask ---- arch/x86/kernel/ftrace.c | 15 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/ftrace.h | 5 +- kernel/trace/Kconfig | 1 - kernel/trace/ftrace.c | 198 ++++++++++--------- kernel/trace/ring_buffer.c | 394 +++++++++++++++++++++++++++++-------- kernel/trace/trace.c | 49 ++--- 7 files changed, 446 insertions(+), 218 deletions(-)