From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753290AbaCGSSe (ORCPT ); Fri, 7 Mar 2014 13:18:34 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.227]:7199 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752411AbaCGSSd (ORCPT ); Fri, 7 Mar 2014 13:18:33 -0500 Date: Fri, 7 Mar 2014 13:18:31 -0500 From: Steven Rostedt Cc: Petr Mladek , Frederic Weisbecker , Masami Hiramatsu , "Paul E. McKenney" , Jiri Kosina , linux-kernel@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" Subject: Re: [PATCH 4/4] x86: Fix order of warning messages when ftrace modifies code Message-ID: <20140307131831.0eefb839@gandalf.local.home> In-Reply-To: <1392650573-3390-5-git-send-email-pmladek@suse.cz> References: <1392650573-3390-1-git-send-email-pmladek@suse.cz> <1392650573-3390-5-git-send-email-pmladek@suse.cz> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org H. Peter, I just added this to my 3.16 queue. But can you give an Acked-by for it too. That way I don't forget to ask you later (3.16 is a ways away ;-) I'd add it to my 3.15 queue, but I'm trying not to make changes to it unless they are more significant. -- Steve On Mon, 17 Feb 2014 16:22:53 +0100 Petr Mladek 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 > --- > 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; >