X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Fnmi.c;h=0178457db72130b54d3170dfd8150742b8addfe1;hp=8bbdbda07a2d6c0dd54d68ec06ea968b52d064fb;hb=8446f1d391f3d27e6bf9c43d4cbcdac0ca720417;hpb=4732efbeb997189d9f9b04708dc26bf8613ed721

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 8bbdbda07a2..0178457db72 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -478,6 +478,11 @@ void touch_nmi_watchdog (void)
 	 */
 	for (i = 0; i < NR_CPUS; i++)
 		alert_counter[i] = 0;
+
+	/*
+	 * Tickle the softlockup detector too:
+	 */
+	touch_softlockup_watchdog();
 }
 
 extern void die_nmi(struct pt_regs *, const char *msg);