Add the word 'Warning' in check_nmi_watchdog() output
PATCH v2 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 | 3 ++- arch/x86/kernel/nmi_64.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/nmi_32.c +2 -1
@@ -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));
arch/x86/kernel/nmi_64.c +2 -1
@@ -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);
Signature · 1 line
1.5.3.5.562.g2544e
Quoted 11 lines · 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 <[email protected]>
thanks, i've picked this up into the x86 tree for .24 merge.
Ingo