diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2014-09-08 08:44:50 +0000 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2014-09-08 08:44:50 +0000 |
| commit | af6fb4b67f48fb57b3488289f90fe4defb6742e1 (patch) | |
| tree | 75ed42f8890203a29e38b383b3ddb9c5b8ae7bc7 | |
| parent | 1fec365dc923d45fc8d37b41c4b3e48a45d90cd8 (diff) | |
| download | FreeBSD-src-af6fb4b67f48fb57b3488289f90fe4defb6742e1.zip FreeBSD-src-af6fb4b67f48fb57b3488289f90fe4defb6742e1.tar.gz | |
pause_sbt(): Take the cold path (ie. use DELAY()) if KDB is active
This fixes a panic in the i915 driver when one uses debug.kdb.enter=1
under vt(4).
PR: 193269
Reported by: emaste@
Submitted by: avg@
MFC after: 3 days
| -rw-r--r-- | sys/kern/kern_synch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 37c538b..02a8cf9 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -362,7 +362,7 @@ pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) if (sbt == 0) sbt = tick_sbt; - if (cold) { + if (cold || kdb_active) { /* * We delay one second at a time to avoid overflowing the * system specific DELAY() function(s): |
