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

[PATCH v2] 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 Zckus <dzickus@redhat.com>
---
 arch/x86/kernel/nmi_32.c |    3 ++-
 arch/x86/kernel/nmi_64.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index 600fd40..852db29 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -105,7 +105,8 @@ 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(KERN_WARNING "WARNING: CPU#%d: 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..4253c4e 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -109,7 +109,8 @@ 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(KERN_WARNING "WARNING: CPU#%d: NMI "
+			       "appears to be stuck (%d->%d)!\n",
 			       cpu,
 			       counts[cpu],
 			       cpu_pda(cpu)->__nmi_count);
-- 
1.5.3.5.562.g2544e

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

[Ingo Molnar]

* 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.
> 
> 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 Zckus <dzickus@redhat.com>

thanks, i've picked this up into the x86 tree for .24 merge.

	Ingo