git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 1486eb859d525a8be763530c3318293b9b81abc0
Christoph Lameter (1):
tracing: Replace __get_cpu_var uses with this_cpu_ptr
Frederic Weisbecker (1):
tracing: Remove myself as a tracing maintainer
Steven Rostedt (1):
ftrace/x86: Move the mcount/fentry code out of entry_64.S
Steven Rostedt (Red Hat) (10):
ftrace: Have function graph tracer use global_ops for filtering
tracing: Add trace_<tracepoint>_enabled() function
tracing: Add __bitmask() macro to trace events to cpumasks and other
bitmasks
ftrace: Remove boolean of hash_enable and hash_disable
ftrace: Write in missing comment from a very old commit
ftrace: Always inline ftrace_hash_empty() helper function
ftrace/x86: Get the current mcount addr for add_breakpoint()
ftrace: Make get_ftrace_addr() and get_ftrace_addr_old() global
ftrace: Use the ftrace_addr helper functions to find the ftrace_addr
ftrace: Remove FTRACE_UPDATE_MODIFY_CALL_REGS flag
----
Documentation/trace/tracepoints.txt | 24 ++++
MAINTAINERS | 1 -
arch/x86/kernel/Makefile | 1 +
arch/x86/kernel/entry_64.S | 204 ---------------------------------
arch/x86/kernel/ftrace.c | 43 +------
arch/x86/kernel/mcount_64.S | 217 ++++++++++++++++++++++++++++++++++++
include/linux/ftrace.h | 4 +-
include/linux/ftrace_event.h | 3 +
include/linux/kprobes.h | 2 +-
include/linux/trace_seq.h | 10 ++
include/linux/tracepoint.h | 10 ++
include/trace/ftrace.h | 57 +++++++++-
kernel/trace/ftrace.c | 100 +++++++++++------
kernel/trace/trace.c | 2 +-
kernel/trace/trace_output.c | 41 +++++++
15 files changed, 436 insertions(+), 283 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
