patch-2.4.23 linux-2.4.23/arch/x86_64/kernel/nmi.c
Next file: linux-2.4.23/arch/x86_64/kernel/pci-gart.c
Previous file: linux-2.4.23/arch/x86_64/kernel/mpparse.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/x86_64/kernel/nmi.c
- Orig date:
2003-06-13 07:51:32.000000000 -0700
diff -urN linux-2.4.22/arch/x86_64/kernel/nmi.c linux-2.4.23/arch/x86_64/kernel/nmi.c
@@ -30,6 +30,7 @@
unsigned int nmi_watchdog = NMI_LOCAL_APIC;
static unsigned int nmi_hz = HZ;
unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */
+int panic_on_timeout;
int nmi_watchdog_disabled;
@@ -121,6 +122,13 @@
{
int nmi;
+ if (!strncmp(str,"panic",5)) {
+ panic_on_timeout = 1;
+ str = strchr(str, ',');
+ if (!str)
+ return 1;
+ ++str;
+ }
get_option(&str, &nmi);
if (nmi >= NMI_INVALID)
@@ -380,6 +388,8 @@
bust_spinlocks(1);
printk("NMI Watchdog detected LOCKUP on CPU%d, eip %16lx, registers:\n", cpu, regs->rip);
show_registers(regs);
+ if (panic_on_timeout)
+ panic("NMI lockup");
printk("console shuts up ...\n");
console_silent();
spin_unlock(&nmi_print_lock);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)