diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-20 12:30:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-20 12:30:10 -0700 |
| commit | 160062e19001b224370cddeaf652f258fd916fb0 (patch) | |
| tree | de1e9fc6f241141a9a5960b170b774841152e2b1 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | ring-buffer: Have ring_buffer_iter_empty() return true when empty (diff) | |
| download | wireguard-linux-160062e19001b224370cddeaf652f258fd916fb0.tar.xz wireguard-linux-160062e19001b224370cddeaf652f258fd916fb0.zip | |
Merge tag 'trace-v4.11-rc5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull two more ftrace fixes from Steven Rostedt:
"While continuing my development, I uncovered two more small bugs.
One is a race condition when enabling the snapshot function probe
trigger. It enables the probe before allocating the snapshot, and if
the probe triggers first, it stops tracing with a warning that the
snapshot buffer was not allocated.
The seconds is that the snapshot file should show how to use it when
it is empty. But a bug fix from long ago broke the "is empty" test and
the snapshot file no longer displays the help message"
* tag 'trace-v4.11-rc5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ring-buffer: Have ring_buffer_iter_empty() return true when empty
tracing: Allocate the snapshot buffer before enabling probe
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions