watchdog: Allow touch_nmi_watchdog() to be called by acpi_os_stall()

Commit Message

Rafael Wysocki Aug. 25, 2010, 10:58 p.m. UTC

None

Patch

Index: linux-2.6/kernel/watchdog.c
===================================================================
--- linux-2.6.orig/kernel/watchdog.c
+++ linux-2.6/kernel/watchdog.c
@@ -142,8 +142,8 @@  void touch_all_softlockup_watchdogs(void
 #ifdef CONFIG_HARDLOCKUP_DETECTOR
 void touch_nmi_watchdog(void)
 {
-	__get_cpu_var(watchdog_nmi_touch) = true;
-	touch_softlockup_watchdog();
+	__raw_get_cpu_var(watchdog_nmi_touch) = true;
+	__raw_get_cpu_var(watchdog_touch_ts) = 0;
 }
 EXPORT_SYMBOL(touch_nmi_watchdog);