git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 62a207d748dd9224140a634786b274fdb6ece0b9
Masami Hiramatsu (3):
kprobes/ftrace: Recover original IP if pre_handler doesn't change it
ftrace, kprobes: Support IPMODIFY flag to find IP modify conflict
kprobes: Add IPMODIFY flag to kprobe_ftrace_ops
Steven Rostedt (Red Hat) (2):
tracing/trivial: Fix typos and make an int into a bool
ftrace/x86: Have static function tracing always test for function graph
----
Documentation/trace/ftrace.txt | 5 ++
arch/x86/kernel/kprobes/ftrace.c | 9 ++-
arch/x86/kernel/mcount_64.S | 3 +-
include/linux/ftrace.h | 16 ++++-
kernel/kprobes.c | 2 +-
kernel/trace/ftrace.c | 144 ++++++++++++++++++++++++++++++++++++++-
kernel/trace/trace_functions.c | 6 +-
7 files changed, 172 insertions(+), 13 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/
