Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdb: call touch_softlockup_watchdog on resume
kgdb, x86: Avoid invoking kgdb_nmicallback twice per NMI
+4
-6
+1
-6
arch/x86/kernel/kgdb.c
+1
-6
arch/x86/kernel/kgdb.c
···
455
455
return NOTIFY_DONE;
456
456
457
457
case DIE_NMI_IPI:
458
-
if (atomic_read(&kgdb_active) != -1) {
459
-
/* KGDB CPU roundup */
460
-
kgdb_nmicallback(raw_smp_processor_id(), regs);
461
-
was_in_debug_nmi[raw_smp_processor_id()] = 1;
462
-
touch_nmi_watchdog();
463
-
}
458
+
/* Just ignore, we will handle the roundup on DIE_NMI. */
464
459
return NOTIFY_DONE;
465
460
466
461
case DIE_NMIUNKNOWN:
+3
kernel/kgdb.c
+3
kernel/kgdb.c
···
590
590
591
591
/* Signal the primary CPU that we are done: */
592
592
atomic_set(&cpu_in_kgdb[cpu], 0);
593
+
touch_softlockup_watchdog();
593
594
clocksource_touch_watchdog();
594
595
local_irq_restore(flags);
595
596
}
···
1433
1432
atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
1434
1433
1435
1434
atomic_set(&kgdb_active, -1);
1435
+
touch_softlockup_watchdog();
1436
1436
clocksource_touch_watchdog();
1437
1437
local_irq_restore(flags);
1438
1438
···
1526
1524
kgdb_restore:
1527
1525
/* Free kgdb_active */
1528
1526
atomic_set(&kgdb_active, -1);
1527
+
touch_softlockup_watchdog();
1529
1528
clocksource_touch_watchdog();
1530
1529
local_irq_restore(flags);
1531
1530