lkml.org 
[lkml]   [2014]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4/4] x86: Fix order of warning messages when ftrace modifies code
On Thu 06-03-14 18:19:53, Steven Rostedt wrote:
>
> I'm digging through older email, and notice you dropped this patch
> from your last series. It is a rather trivial patch, and I don't really
> care if it gets applied or not. But was there a reason to drop it? Or
> do you not care either?

I wanted to keep the last patch set short and easy to apply, so I kept
only the most important changes in it.

This patch is nice to have but it is rather cosmetic. I do not mind
that much about it. Feel free to drop, accept, or just merge into
any other commit.

Best Regards,
Petr

> -- Steve
>
>
> On Mon, 17 Feb 2014 16:22:53 +0100
> Petr Mladek <pmladek@suse.cz> wrote:
>
> > 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;
> >
>


\
 
 \ /
  Last update: 2014-03-09 16:03    [W:2.895 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site