diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-11 12:22:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-11 12:22:38 -0800 |
commit | 6674fdb25a9effc620c95d4c231a6ccc97b2f9b1 (patch) | |
tree | 66ad50239c3a6cc179d2857fa0a7b1bafaf5a652 /kernel/trace/trace_events_inject.c | |
parent | d1c6a2aa02af09238ad09493eb3c8685ccc3fe12 (diff) | |
parent | ff205766dbbee024a4a716638868d98ffb17748a (diff) |
Merge tag 'trace-v5.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
- Remove code I accidentally applied when doing a minor fix up to a
patch, and then using "git commit -a --amend", which pulled in some
other changes I was playing with.
- Remove an used variable in trace_events_inject code
- Fix function graph tracer when it traces a ftrace direct function.
It will now ignore tracing a function that has a ftrace direct
tramploine attached. This is needed for eBPF to use the ftrace direct
code.
* tag 'trace-v5.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace: Fix function_graph tracer interaction with BPF trampoline
tracing: remove set but not used variable 'buffer'
module: Remove accidental change of module_enable_x()
Diffstat (limited to 'kernel/trace/trace_events_inject.c')
-rw-r--r-- | kernel/trace/trace_events_inject.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace_events_inject.c b/kernel/trace/trace_events_inject.c index d43710718ee5..d45079ee62f8 100644 --- a/kernel/trace/trace_events_inject.c +++ b/kernel/trace/trace_events_inject.c @@ -17,12 +17,10 @@ static int trace_inject_entry(struct trace_event_file *file, void *rec, int len) { struct trace_event_buffer fbuffer; - struct ring_buffer *buffer; int written = 0; void *entry; rcu_read_lock_sched(); - buffer = file->tr->trace_buffer.buffer; entry = trace_event_buffer_reserve(&fbuffer, file, len); if (entry) { memcpy(entry, rec, len); |