]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
kgdb: call touch_softlockup_watchdog on resume
authorJason Wessel <jason.wessel@windriver.com>
Mon, 6 Oct 2008 18:50:59 +0000 (13:50 -0500)
committerJason Wessel <jason.wessel@windriver.com>
Mon, 6 Oct 2008 18:50:59 +0000 (13:50 -0500)
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>
kernel/kgdb.c

index 25d955dbb989ce8c1c1ce75b156287ca1e800209..e4dcfb2272a4184b19903927b1c438169788461a 100644 (file)
@@ -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);