diff options
| author | ups <ups@FreeBSD.org> | 2005-06-09 19:43:08 +0000 |
|---|---|---|
| committer | ups <ups@FreeBSD.org> | 2005-06-09 19:43:08 +0000 |
| commit | 4421a087425df7cc08a5671152d0ec7410bdb33e (patch) | |
| tree | 55e015fef1ea05e35b6846d4656c33e1fd233574 /sys/kern/kern_switch.c | |
| parent | 899529b7cd4f772024643a7026a6bbf2307b2d02 (diff) | |
| download | FreeBSD-src-4421a087425df7cc08a5671152d0ec7410bdb33e.zip FreeBSD-src-4421a087425df7cc08a5671152d0ec7410bdb33e.tar.gz | |
Lots of whitespace cleanup.
Fix for broken if condition.
Submitted by: nate@
Diffstat (limited to 'sys/kern/kern_switch.c')
| -rw-r--r-- | sys/kern/kern_switch.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index 1870d06..f1fb427 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -428,9 +428,8 @@ maybe_preempt_in_ksegrp(struct thread *td) return; #if defined(IPI_PREEMPTION) && defined(PREEMPTION) - #if !defined(FULL_PREEMPTION) - if (td->td_priority <= PRI_MAX_ITHD) + if (td->td_priority <= PRI_MAX_ITHD) #endif /* ! FULL_PREEMPTION */ { ipi_selected(best_pcpu->pc_cpumask, IPI_PREEMPT); @@ -452,7 +451,7 @@ maybe_preempt_in_ksegrp(struct thread *td) #ifdef PREEMPTION #if !defined(FULL_PREEMPTION) - if (td->td_priority > PRI_MAX_ITHD) { + if (td->td_priority > PRI_MAX_ITHD) { running_thread->td_flags |= TDF_NEEDRESCHED; } #endif /* ! FULL_PREEMPTION */ @@ -676,10 +675,12 @@ maybe_preempt(struct thread *td) TD_IS_INHIBITED(ctd) || td->td_kse->ke_state != KES_THREAD) return (0); #ifndef FULL_PREEMPTION - if ((pri > PRI_MAX_ITHD) && - !(cpri >= PRI_MIN_IDLE)) + if (pri > PRI_MAX_ITHD) return (0); #endif + if (cpri >= PRI_MIN_IDLE) + return (0); + if (ctd->td_critnest > 1) { CTR1(KTR_PROC, "maybe_preempt: in critical section %d", ctd->td_critnest); |
