diff options
| author | emaste <emaste@FreeBSD.org> | 2007-05-28 19:51:12 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2007-05-28 19:51:12 +0000 |
| commit | 97246597c78263e664bd354ebe5a97719335417e (patch) | |
| tree | b8b128c8f88871340bbed542418ed0c85a89f7c7 /sys/kern/kern_clock.c | |
| parent | 069f479480f747e9a4f084a585dee2f7276208cf (diff) | |
| download | FreeBSD-src-97246597c78263e664bd354ebe5a97719335417e.zip FreeBSD-src-97246597c78263e664bd354ebe5a97719335417e.tar.gz | |
Eliminate explicit kdb_enter in the software watchdog handler (which
produced incorrect behaviour with the KDB_UNATTENDED option) and call
panic in both the KDB and non-KDB cases. This change is consistent
with rwatson's current kdb/ddb work.
Diffstat (limited to 'sys/kern/kern_clock.c')
| -rw-r--r-- | sys/kern/kern_clock.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index f75555b..aa5839b 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -555,7 +555,7 @@ watchdog_config(void *unused __unused, u_int cmd, int *error) /* * Handle a watchdog timeout by dumping interrupt information and - * then either dropping to DDB or panicing. + * then panicking. */ static void watchdog_fire(void) @@ -578,13 +578,7 @@ watchdog_fire(void) inttotal += *curintr++; } printf("Total %20ju\n", (uintmax_t)inttotal); - -#ifdef KDB - kdb_backtrace(); - kdb_enter("watchdog timeout"); -#else panic("watchdog timeout"); -#endif /* KDB */ } #endif /* SW_WATCHDOG */ |
