diff options
| author | Petr Mladek <pmladek@suse.cz> | 2014-02-17 19:22:53 +0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-21 22:00:35 +0400 |
| commit | 74bb8c450459c35ea48806b582b634bbbb9ebb09 (patch) | |
| tree | fbb19d7df0f185b3bf6a31e45be464f8b16b63d3 /arch/x86/kernel | |
| parent | 02f2f7646fd5d0482e805d728601e8e4305ad56f (diff) | |
| download | linux-74bb8c450459c35ea48806b582b634bbbb9ebb09.tar.xz | |
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>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 52819e816f87..3d837b00502b 100644 --- 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); /* |