ftrace/x86: Fix order of warning messages when ftrace modifies code

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.

Link: http://lkml.kernel.org/r/1392650573-3390-5-git-send-email-pmladek@suse.cz
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 52819e8..3d837b0 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -621,8 +621,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) {
                rec = ftrace_rec_iter_record(iter);
                /*