From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757912AbcCRRuA (ORCPT ); Fri, 18 Mar 2016 13:50:00 -0400 Received: from casper.infradead.org ([85.118.1.10]:40646 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757812AbcCRRt4 (ORCPT ); Fri, 18 Mar 2016 13:49:56 -0400 Date: Fri, 18 Mar 2016 18:49:53 +0100 From: Peter Zijlstra To: Don Zickus Cc: linux-kernel@vger.kernel.org, rostedt@goodmis.org, mingo@kernel.org, tglx@linutronix.de, jkosina@suse.cz Subject: Re: [PATCH 1/2] watchdog: Fix output Message-ID: <20160318174953.GK6344@twins.programming.kicks-ass.net> References: <20160318152802.407611377@infradead.org> <20160318153022.027826871@infradead.org> <20160318163748.GR64531@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160318163748.GR64531@redhat.com> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 18, 2016 at 12:37:48PM -0400, Don Zickus wrote: > +++ b/kernel/watchdog.c > @@ -9,7 +9,7 @@ > * to those contributors as well. > */ > > -#define pr_fmt(fmt) "NMI watchdog: " fmt > +#define pr_fmt(fmt) "Lockup detector: " fmt > > #include > #include > @@ -350,7 +350,7 @@ static void watchdog_overflow_callback(struct perf_event *event, > if (__this_cpu_read(hard_watchdog_warn) == true) > return; > > - pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu); > + pr_emerg("Detected hard LOCKUP on cpu %d", this_cpu); > print_modules(); > print_irqtrace_events(current); > if (regs) It was Jiri who made this mess by replacing WARN(), which has a very distinct format, with this custom stuff. I think we should go back to the WARN() thing.