Add the word 'Warning' in check_nmi_watchdog() output
PATCH 1/1 Add the word 'Warning' in check_nmi_watchdog() output
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.
--- arch/x86/kernel/nmi_32.c | 2 +- arch/x86/kernel/nmi_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/nmi_32.c +1 -1
@@ -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));
arch/x86/kernel/nmi_64.c +1 -1
@@ -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);
Signature · 1 line
1.5.3.5.562.g2544e
Quoted 4 lines · On Wed, 21 Nov 2007 12:14:20 -0500 Don Zickus <[email protected]> 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:"....
Quoted 11 lines · Arjan van de Ven
Quoted 4 lines · On Wed, 21 Nov 2007 12:14:20 -0500 Don Zickus <[email protected]> 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
Quoted 10 lines · Don Zickus
Quoted 9 lines · Arjan van de Ven
Quoted 4 lines · On Wed, 21 Nov 2007 12:14:20 -0500 Don Zickus <[email protected]> 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.
Quoted 4 lines
Quoted 2 lines
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