Re: nmi_watchdog=2 regression in 2.6.21

Daniel Walker
2007-08-28T20:35:28Z

Here's a simpler patch that fixes the boot hang ..

We have to call off the IPI looping regardless of the check_nmi_watchdog
outcome..

Signed-off-by: Daniel Walker <dwalker@mvista.com>

Index: linux-2.6.22/arch/i386/kernel/nmi.c
===================================================================
--- linux-2.6.22.orig/arch/i386/kernel/nmi.c 2007-08-15 00:51:12.000000000 +0000
+++ linux-2.6.22/arch/i386/kernel/nmi.c 2007-08-28 20:27:56.000000000 +0000
@@ -122,12 +122,12 @@ static int __init check_nmi_watchdog(voi
atomic_dec(&nmi_active);
}
}
+ endflag = 1;
if (!atomic_read(&nmi_active)) {
kfree(prev_nmi_count);
atomic_set(&nmi_active, -1);
return -1;
}
- endflag = 1;
printk("OK.\n");

/* now that we know it works we can reduce NMI frequency to