diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2016-11-12 00:23:09 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2016-11-12 00:23:09 +0000 |
| commit | 892f0ab0ab9ff6d9088523248a6c851c2606cc06 (patch) | |
| tree | 0bd925380ab78aba1281d02035b873e2a579421e | |
| parent | a6b91f0f4577a267241f6c33756b3c5ca4ad0550 (diff) | |
Notes
| -rw-r--r-- | sys/kern/sched_4bsd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 689cb95ce5c1..f97da1714681 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -326,7 +326,6 @@ maybe_preempt(struct thread *td) * - The current thread has a higher (numerically lower) or * equivalent priority. Note that this prevents curthread from * trying to preempt to itself. - * - It is too early in the boot for context switches (cold is set). * - The current thread has an inhibitor set or is in the process of * exiting. In this case, the current thread is about to switch * out anyways, so there's no point in preempting. If we did, @@ -347,7 +346,7 @@ maybe_preempt(struct thread *td) ("maybe_preempt: trying to run inhibited thread")); pri = td->td_priority; cpri = ctd->td_priority; - if (panicstr != NULL || pri >= cpri || cold /* || dumping */ || + if (panicstr != NULL || pri >= cpri /* || dumping */ || TD_IS_INHIBITED(ctd)) return (0); #ifndef FULL_PREEMPTION @@ -1105,7 +1104,7 @@ forward_wakeup(int cpunum) if ((!forward_wakeup_enabled) || (forward_wakeup_use_mask == 0 && forward_wakeup_use_loop == 0)) return (0); - if (!smp_started || cold || panicstr) + if (!smp_started || panicstr) return (0); forward_wakeups_requested++; |
