Kaixu Xia <[email protected]>, Steven Rostedt (VMware) <[email protected]>
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: b111545d26c0d66dd9aae668d9373669e752b075
Kaixu Xia (1):
tracing: Remove the useless value assignment in test_create_synth_event()
Steven Rostedt (VMware) (3):
ftrace: Have the callbacks receive a struct ftrace_regs instead of pt_regs
ftrace/x86: Allow for arguments to be passed in to ftrace_regs by default
livepatch: Use the default ftrace_ops instead of REGS when ARGS is
available
----
arch/csky/kernel/probes/ftrace.c | 4 +++-
arch/nds32/kernel/ftrace.c | 4 ++--
arch/parisc/kernel/ftrace.c | 8 +++++---
arch/powerpc/include/asm/livepatch.h | 4 +++-
arch/powerpc/kernel/kprobes-ftrace.c | 4 +++-
arch/s390/include/asm/livepatch.h | 5 ++++-
arch/s390/kernel/ftrace.c | 4 +++-
arch/x86/Kconfig | 1 +
arch/x86/include/asm/ftrace.h | 18 ++++++++++++++++++
arch/x86/include/asm/livepatch.h | 4 ++--
arch/x86/kernel/ftrace_64.S | 15 +++++++++++++--
arch/x86/kernel/kprobes/ftrace.c | 3 ++-
fs/pstore/ftrace.c | 2 +-
include/linux/ftrace.h | 28 ++++++++++++++++++++++++++--
include/linux/kprobes.h | 2 +-
kernel/livepatch/Kconfig | 2 +-
kernel/livepatch/patch.c | 10 ++++++----
kernel/trace/Kconfig | 9 +++++++++
kernel/trace/ftrace.c | 27 +++++++++++++++------------
kernel/trace/synth_event_gen_test.c | 2 +-
kernel/trace/trace_event_perf.c | 2 +-
kernel/trace/trace_events.c | 2 +-
kernel/trace/trace_functions.c | 9 ++++-----
kernel/trace/trace_irqsoff.c | 2 +-
kernel/trace/trace_sched_wakeup.c | 2 +-
kernel/trace/trace_selftest.c | 20 +++++++++++---------
kernel/trace/trace_stack.c | 2 +-
27 files changed, 139 insertions(+), 56 deletions(-)
