summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2008-10-06 20:50:59 +0200
committerJason Wessel <jason.wessel@windriver.com>2008-10-06 20:50:59 +0200
commitcc1e0f4f7ad95a9eb81e1904cb16068af226180d (patch)
treee236d87c949e9697514a6362f86391f37c6341bd
parentkgdb, x86: Avoid invoking kgdb_nmicallback twice per NMI (diff)
downloadlinux-cc1e0f4f7ad95a9eb81e1904cb16068af226180d.tar.xz
linux-cc1e0f4f7ad95a9eb81e1904cb16068af226180d.zip
kgdb: call touch_softlockup_watchdog on resume
The softlockup watchdog needs to be touched when resuming the from the kgdb stopped state to avoid the printk that a CPU is stuck if the debugger was active for longer than the softlockup threshold. Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to '')
-rw-r--r--kernel/kgdb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/kgdb.c b/kernel/kgdb.c
index 25d955dbb989..e4dcfb2272a4 100644
--- a/kernel/kgdb.c
+++ b/kernel/kgdb.c
@@ -590,6 +590,7 @@ static void kgdb_wait(struct pt_regs *regs)
/* Signal the primary CPU that we are done: */
atomic_set(&cpu_in_kgdb[cpu], 0);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);
}
@@ -1432,6 +1433,7 @@ acquirelock:
atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
atomic_set(&kgdb_active, -1);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);
@@ -1524,6 +1526,7 @@ acquirelock:
kgdb_restore:
/* Free kgdb_active */
atomic_set(&kgdb_active, -1);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);