diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
| commit | 47dfb8d658406ebf07225c0104ebe4be06ae405f (patch) | |
| tree | 83174cbd9592560c48ad2cd11afe42c5c12b6c1b /sys/kern/kern_synch.c | |
| parent | 131cd15b13bbd3e141e911a65cf7a1895ec6ab05 (diff) | |
| parent | 13d657a35d96e65f1be391830f36e1adff33534f (diff) | |
| download | FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.zip FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/kern/kern_synch.c')
| -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 867c263..fbad175 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 || kdb_active) { + if (cold || kdb_active || SCHEDULER_STOPPED()) { /* * We delay one second at a time to avoid overflowing the * system specific DELAY() function(s): |
