[tip:perf/core] tracing: Skip printing "OK" if failed to disable event
From: tip-bot for Yuanhan Liu
Date: Fri Sep 14 2012 - 07:46:31 EST
Commit-ID: 76bab1b78ab6f25d5f74165f94526c25fc93d984
Gitweb: http://git.kernel.org/tip/76bab1b78ab6f25d5f74165f94526c25fc93d984
Author: Yuanhan Liu <yuanhan.liu@xxxxxxxxxxxxxxx>
AuthorDate: Mon, 27 Aug 2012 15:13:45 +0800
Committer: Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Thu, 13 Sep 2012 22:52:07 -0400
tracing: Skip printing "OK" if failed to disable event
No acutal case found. But logically, we should skip "OK" in case any
error met.
Link: http://lkml.kernel.org/r/1346051625-25231-1-git-send-email-yuanhan.liu@xxxxxxxxxxxxxxx
Signed-off-by: Yuanhan Liu <yuanhan.liu@xxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace_events.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 6825d83..bbb0e63 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1646,9 +1646,11 @@ static __init void event_trace_self_tests(void)
event_test_stuff();
ret = __ftrace_set_clr_event(NULL, system->name, NULL, 0);
- if (WARN_ON_ONCE(ret))
+ if (WARN_ON_ONCE(ret)) {
pr_warning("error disabling system %s\n",
system->name);
+ continue;
+ }
pr_cont("OK\n");
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/