Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757368Ab3G2Pcg (ORCPT ); Mon, 29 Jul 2013 11:32:36 -0400 Received: from perches-mx.perches.com ([206.117.179.246]:51327 "EHLO labridge.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751155Ab3G2Pce (ORCPT ); Mon, 29 Jul 2013 11:32:34 -0400 Message-ID: <1375111953.2075.42.camel@joe-AO722> Subject: Re: [PATCH] APEI/ERST: Fix error message formatting From: Joe Perches To: Borislav Petkov Cc: Bjorn Helgaas , "Naveen N. Rao" , LKML , Borislav Petkov , Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck , Len Brown , "Rafael J. Wysocki" , "linux-acpi@vger.kernel.org" , "Huang, Ying" Date: Mon, 29 Jul 2013 08:32:33 -0700 In-Reply-To: <20130729152230.GG6634@pd.tnic> References: <1374526866-6813-1-git-send-email-bp@alien8.de> <20130724171347.GB29756@naverao1-tp.watson.ibm.com> <1374686598.18818.18.camel@joe-AO722> <51F10AA8.2050901@linux.vnet.ibm.com> <20130729135812.GD6634@pd.tnic> <20130729144046.GE6634@pd.tnic> <20130729152230.GG6634@pd.tnic> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1493 Lines: 49 On Mon, 2013-07-29 at 17:22 +0200, Borislav Petkov wrote: [] > Right, I'll make it be a hex "0x" in both stall-functions and leave it > to someone more ACPI-knowledgeable to decide what goes in there - my > patch is a simple cleanup anyway. [] > From: Borislav Petkov [] > diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c [] > @@ -39,7 +39,8 @@ > > #include "apei-internal.h" > > -#define ERST_PFX "ERST: " > +#undef pr_fmt > +#define pr_fmt(fmt) "ERST: " fmt This reverses the order of some ERST/FW_WARN messages. I don't know if that matters to any log scrapers. > @@ -109,8 +110,7 @@ static inline int erst_errno(int command_status) > static int erst_timedout(u64 *t, u64 spin_unit) > { > if ((s64)*t < spin_unit) { > - pr_warning(FW_WARN ERST_PFX > - "Firmware does not respond in time\n"); > + pr_warn(FW_WARN "Firmware does not respond in time\n"); etc... > @@ -271,8 +271,7 @@ static int erst_exec_move_data(struct apei_exec_context *ctx, > > /* ioremap does not work in interrupt context */ > if (in_interrupt()) { > - pr_warning(ERST_PFX > - "MOVE_DATA can not be used in interrupt context"); > + pr_warn("MOVE_DATA can not be used in interrupt context"); missing newline -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/