diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 17:47:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 17:47:28 +0100 |
| commit | f4267b3604a84ff72c013a0e3e467289908603a6 (patch) | |
| tree | e4d19ae71a3bbaa62dbab2c997b0465f8a2c3303 /kernel | |
| parent | Merge tag 'for-linus-4.20a-rc1-tag' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | selftests/ftrace: Fix synthetic event test to delete event correctly (diff) | |
| download | linux-f4267b3604a84ff72c013a0e3e467289908603a6.tar.xz linux-f4267b3604a84ff72c013a0e3e467289908603a6.zip | |
Merge tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Masami had a couple more fixes to the synthetic events. One was a
proper error return value, and the other is for the self tests"
* tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
selftests/ftrace: Fix synthetic event test to delete event correctly
tracing: Return -ENOENT if there is no target synthetic event
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index d239004aaf29..eb908ef2ecec 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1063,8 +1063,10 @@ static int create_synth_event(int argc, char **argv) event = NULL; ret = -EEXIST; goto out; - } else if (delete_event) + } else if (delete_event) { + ret = -ENOENT; goto out; + } if (argc < 2) { ret = -EINVAL; |