Skip to content

Commit 74bb8c4

Browse files
pmladekrostedt
authored andcommitted
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/[email protected] Signed-off-by: Petr Mladek <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 02f2f76 commit 74bb8c4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/ftrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ void ftrace_replace_code(int enable)
621621
return;
622622

623623
remove_breakpoints:
624+
pr_warn("Failed on %s (%d):\n", report, count);
624625
ftrace_bug(ret, rec ? rec->ip : 0);
625-
printk(KERN_WARNING "Failed on %s (%d):\n", report, count);
626626
for_ftrace_rec_iter(iter) {
627627
rec = ftrace_rec_iter_record(iter);
628628
/*

0 commit comments

Comments
 (0)