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 <linux/mm.h> > #include <linux/cpu.h> > @@ -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.