From: tip-bot for Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
yuanhan.liu@linux.intel.com, rostedt@goodmis.org,
tglx@linutronix.de
Subject: [tip:perf/core] tracing: Skip printing "OK" if failed to disable event
Date: Fri, 14 Sep 2012 04:40:41 -0700 [thread overview]
Message-ID: <tip-76bab1b78ab6f25d5f74165f94526c25fc93d984@git.kernel.org> (raw)
In-Reply-To: <1346051625-25231-1-git-send-email-yuanhan.liu@linux.intel.com>
Commit-ID: 76bab1b78ab6f25d5f74165f94526c25fc93d984
Gitweb: http://git.kernel.org/tip/76bab1b78ab6f25d5f74165f94526c25fc93d984
Author: Yuanhan Liu <yuanhan.liu@linux.intel.com>
AuthorDate: Mon, 27 Aug 2012 15:13:45 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
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@linux.intel.com
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
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");
}
prev parent reply other threads:[~2012-09-14 11:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 7:13 [PATCH] tracing: skip " Yuanhan Liu
2012-09-14 11:40 ` tip-bot for Yuanhan Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-76bab1b78ab6f25d5f74165f94526c25fc93d984@git.kernel.org \
--to=yuanhan.liu@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®