[PATCH] Add the word 'Warning' in check_nmi_watchdog() output

[PATCH] Add the word 'Warning' in check_nmi_watchdog() output

[Don Zickus]

Our automated test suite looks for keywords like error, fail, warning in the
boot log.  In the case when the nmi watchdog is determined to be stuck in
check_nmi_watchdog(), none of those keywords are displayed.

This patch adds a keyword, 'Warning, so it makes it easier to notice when the nmi
watchdog isn't working correctly.

No technical changes have been made.  Compiler tested.

Signed-off-by: Don Zickus <dzickus@redhat.com>
---
 arch/x86/kernel/nmi_32.c |    2 +-
 arch/x86/kernel/nmi_64.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index 600fd40..47448ac 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -105,7 +105,7 @@ static int __init check_nmi_watchdog(void)
 		if (!per_cpu(wd_enabled, cpu))
 			continue;
 		if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
-			printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
+			printk("CPU#%d: Warning NMI appears to be stuck (%d->%d)!\n",
 				cpu,
 				prev_nmi_count[cpu],
 				nmi_count(cpu));
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index a576fd7..a460d4a 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -109,7 +109,7 @@ int __init check_nmi_watchdog (void)
 		if (!per_cpu(wd_enabled, cpu))
 			continue;
 		if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) {
-			printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
+			printk("CPU#%d: Warning NMI appears to be stuck (%d->%d)!\n",
 			       cpu,
 			       counts[cpu],
 			       cpu_pda(cpu)->__nmi_count);
-- 
1.5.3.5.562.g2544e

Re: [PATCH] Add the word 'Warning' in check_nmi_watchdog() output

[Arjan van de Ven]

On Wed, 21 Nov 2007 12:14:20 -0500
Don Zickus <dzickus@redhat.com> wrote:

> Our automated test suite looks for keywords like error, fail, warning
> in the boot log.  In the case when the nmi watchdog is determined to
> be stuck in check_nmi_watchdog(), none of those keywords are
> displayed.


please make it at least consistent with the other kernel level bad
things, and use "WARNING:"....

Re: [PATCH] Add the word 'Warning' in check_nmi_watchdog() output

[Don Zickus]

On Wed, Nov 21, 2007 at 10:34:59AM -0800, Arjan van de Ven wrote:
> On Wed, 21 Nov 2007 12:14:20 -0500
> Don Zickus <dzickus@redhat.com> wrote:
> 
> > Our automated test suite looks for keywords like error, fail, warning
> > in the boot log.  In the case when the nmi watchdog is determined to
> > be stuck in check_nmi_watchdog(), none of those keywords are
> > displayed.
> 
> 
> please make it at least consistent with the other kernel level bad
> things, and use "WARNING:"....

Good point.  I'll repost.

Cheers,
Don

Re: [PATCH] Add the word 'Warning' in check_nmi_watchdog() output

[Thomas Gleixner]

On Wed, 21 Nov 2007, Don Zickus wrote:

> On Wed, Nov 21, 2007 at 10:34:59AM -0800, Arjan van de Ven wrote:
> > On Wed, 21 Nov 2007 12:14:20 -0500
> > Don Zickus <dzickus@redhat.com> wrote:
> > 
> > > Our automated test suite looks for keywords like error, fail, warning
> > > in the boot log.  In the case when the nmi watchdog is determined to
> > > be stuck in check_nmi_watchdog(), none of those keywords are
> > > displayed.
> > 
> > 
> > please make it at least consistent with the other kernel level bad
> > things, and use "WARNING:"....
> 
> Good point.  I'll repost.

Before you repost, please add an appropriate KERN_WARN prefix to the
printk and run your patch through scripts/checkpatch.pl.

	tglx