diff options
| author | attilio <attilio@FreeBSD.org> | 2011-09-27 13:42:11 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-09-27 13:42:11 +0000 |
| commit | f5da64d92a9dcfed1148acf6352f6f9b1954859d (patch) | |
| tree | fca082d40ad9b34cdc89a4691e99cdc19ef4a3e9 /sys/kern/subr_kdb.c | |
| parent | 221b0dbe0c46f6d460aad1fa5dce37bedf054db3 (diff) | |
| download | FreeBSD-src-f5da64d92a9dcfed1148acf6352f6f9b1954859d.zip FreeBSD-src-f5da64d92a9dcfed1148acf6352f6f9b1954859d.tar.gz | |
Revert r225372:
wdog_kern_pat() acquires eventhandler mutex, thus it cannot work in
kernel context (from where kdb_trap() runs).
The right way to fix this is both offering the
cpu-stop-on-panic-and-skip-locking logic and also a context for KDB
to officially run. We can re-enable this (or a similar) improvement
when these 2 patches hit the tree.
Sponsored by: Sandvine Incorporated
Discussed with: emaste, rstone
MFC after: immediately
Diffstat (limited to 'sys/kern/subr_kdb.c')
| -rw-r--r-- | sys/kern/subr_kdb.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 2ee7dc6..76b37a9 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdb.h" #include "opt_stack.h" -#include "opt_watchdog.h" #include <sys/param.h> #include <sys/systm.h> @@ -42,9 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/smp.h> #include <sys/stack.h> #include <sys/sysctl.h> -#ifdef SW_WATCHDOG -#include <sys/watchdog.h> -#endif #include <machine/kdb.h> #include <machine/pcb.h> @@ -591,9 +587,6 @@ kdb_trap(int type, int code, struct trapframe *tf) cpuset_t other_cpus; #endif struct kdb_dbbe *be; -#ifdef SW_WATCHDOG - u_int wdoglvt; -#endif register_t intr; int handled; @@ -607,10 +600,6 @@ kdb_trap(int type, int code, struct trapframe *tf) intr = intr_disable(); -#ifdef SW_WATCHDOG - wdoglvt = wdog_kern_last_timeout(); - wdog_kern_pat(WD_TO_NEVER); -#endif #ifdef SMP other_cpus = all_cpus; CPU_CLR(PCPU_GET(cpuid), &other_cpus); @@ -642,9 +631,6 @@ kdb_trap(int type, int code, struct trapframe *tf) #ifdef SMP restart_cpus(stopped_cpus); #endif -#ifdef SW_WATCHDOG - wdog_kern_pat(wdoglvt); -#endif intr_restore(intr); |
