From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Yuanhan Liu <yuanhan.liu@linux.intel.com>
Subject: [PATCH 1/6 v2] tracing: Skip printing "OK" if failed to disable event
Date: Thu, 13 Sep 2012 23:00:13 -0400 [thread overview]
Message-ID: <20120914030232.120775554@goodmis.org> (raw)
In-Reply-To: 20120914030012.315074731@goodmis.org
[-- Attachment #1: Type: text/plain, Size: 971 bytes --]
From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
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 file changed, 3 insertions(+), 1 deletion(-)
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");
}
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2012-09-14 3:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 3:00 [PATCH 0/6 v2] [GIT PULL][3.7] tracing: cleanups and fixes Steven Rostedt
2012-09-14 3:00 ` Steven Rostedt [this message]
2012-09-14 3:00 ` [PATCH 2/6 v2] trace: Stop compiling in trace_clock unconditionally Steven Rostedt
2012-09-14 3:00 ` [PATCH 3/6 v2] ftrace/x86: Adjust x86 regs.ip as like as x86-64 Steven Rostedt
2012-09-14 3:00 ` [PATCH 4/6 v2] kprobes/x86: Fix kprobes to collectly handle IP on ftrace Steven Rostedt
2012-09-14 3:00 ` [PATCH 5/6 v2] ftrace/x86-64: Allow to change RIP in handlers Steven Rostedt
2012-09-14 3:00 ` [PATCH 6/6 v2] kprobes/x86: Fix to support jprobes on ftrace-based kprobe Steven Rostedt
2012-09-14 11:40 ` [PATCH 0/6 v2] [GIT PULL][3.7] tracing: cleanups and fixes Ingo Molnar
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=20120914030232.120775554@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=yuanhan.liu@linux.intel.com \
/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