From: Petr Mladek <pmladek@suse.cz>
To: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Jiri Kosina <jkosina@suse.cz>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
Petr Mladek <pmladek@suse.cz>
Subject: [PATCH 4/4] x86: Fix order of warning messages when ftrace modifies code
Date: Mon, 17 Feb 2014 16:22:53 +0100 [thread overview]
Message-ID: <1392650573-3390-5-git-send-email-pmladek@suse.cz> (raw)
In-Reply-To: <1392650573-3390-1-git-send-email-pmladek@suse.cz>
The colon at the end of the printk message suggests that it should get printed
before the details printed by ftrace_bug().
When touching the line, let's use the preferred pr_warn() macro as suggested
by checkpatch.pl.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
---
arch/x86/kernel/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 525a9f954c8b..ad7c38f5206b 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -622,8 +622,8 @@ void ftrace_replace_code(int enable)
return;
remove_breakpoints:
+ pr_warn("Failed on %s (%d):\n", report, count);
ftrace_bug(ret, rec ? rec->ip : 0);
- printk(KERN_WARNING "Failed on %s (%d):\n", report, count);
for_ftrace_rec_iter(iter) {
int err;
--
1.8.4
next prev parent reply other threads:[~2014-02-17 15:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-17 15:22 [PATCH 0/4] x86: Fix ftrace recovery when code modification failed Petr Mladek
2014-02-17 15:22 ` [PATCH 1/4] x86: Clean up remove_breakpoint() in ftrace code Petr Mladek
2014-02-17 15:22 ` [PATCH 2/4] x86: Fix ftrace patching recovery code to work on x86_64 Petr Mladek
2014-02-17 15:22 ` [PATCH 3/4] x86: BUG when ftrace patching recovery fails Petr Mladek
2014-02-17 15:22 ` Petr Mladek [this message]
2014-03-06 23:19 ` [PATCH 4/4] x86: Fix order of warning messages when ftrace modifies code Steven Rostedt
2014-03-07 8:43 ` Petr Mládek
2014-03-07 18:15 ` Steven Rostedt
2014-03-07 18:18 ` Steven Rostedt
2014-03-10 8:37 ` Petr Mládek
2014-03-10 12:50 ` Steven Rostedt
2014-02-21 4:23 ` [PATCH 0/4] x86: Fix ftrace recovery when code modification failed Steven Rostedt
2014-02-21 16:33 ` Petr Mládek
2014-02-21 18:01 ` Steven Rostedt
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=1392650573-3390-5-git-send-email-pmladek@suse.cz \
--to=pmladek@suse.cz \
--cc=fweisbec@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.org \
/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®