summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-30 19:47:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-30 19:47:28 +0300
commitf4267b3604a84ff72c013a0e3e467289908603a6 (patch)
treee4d19ae71a3bbaa62dbab2c997b0465f8a2c3303 /kernel
parent5b4c0d87de2d4932354ebcf118677c94533f9a01 (diff)
parent0d0352d8b3d6d7ca9a710b40e194cbbaeb841c88 (diff)
downloadlinux-f4267b3604a84ff72c013a0e3e467289908603a6.tar.xz
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.c4
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;