* [PATCH] watchdog: Allow touch_nmi_watchdog() to be called by acpi_os_stall()
@ 2010-08-25 22:58 Rafael J. Wysocki
0 siblings, 0 replies; only message in thread
From: Rafael J. Wysocki @ 2010-08-25 22:58 UTC (permalink / raw)
To: Frederic Weisbecker; +Cc: linux-kernel, ACPI Devel Maling List, Len Brown
From: Rafael J. Wysocki <rjw@sisk.pl>
acpi_os_stall() executes touch_nmi_watchdog() that, if
CONFIG_HARDLOCKUP_DETECTOR is set,
uses __get_cpu_var() to access per-CPU variables. This triggers the
stack dump in debug_smp_processor_id().
One way to avoid that is to use __raw_get_cpu_var() to access the
per-CPU variables in touch_nmi_watchdog().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/watchdog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-25 23:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-25 22:58 [PATCH] watchdog: Allow touch_nmi_watchdog() to be called by acpi_os_stall() Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).