diff options
| author | jhb <jhb@FreeBSD.org> | 2000-11-16 02:16:44 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-11-16 02:16:44 +0000 |
| commit | c0bba69cbe7c4beee5213a4f1494387ee365db4c (patch) | |
| tree | bc01d9302c1c47d1c7ec3254c6bfc60515318af1 /sys/kern/subr_trap.c | |
| parent | 4b0f06d83c650d18d7bc905ae27eb7412fcfc038 (diff) | |
| download | FreeBSD-src-c0bba69cbe7c4beee5213a4f1494387ee365db4c.zip FreeBSD-src-c0bba69cbe7c4beee5213a4f1494387ee365db4c.tar.gz | |
Don't release and acquire Giant in mi_switch(). Instead, release and
acquire Giant as needed in functions that call mi_switch(). The releases
need to be done outside of the sched_lock to avoid potential deadlocks
from trying to acquire Giant while interrupts are disabled.
Submitted by: witness
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 674f77a..21e5e12 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -192,11 +192,13 @@ userret(p, frame, oticks, have_giant) * our priority. */ s = splhigh(); + DROP_GIANT_NOSWITCH(); mtx_enter(&sched_lock, MTX_SPIN); setrunqueue(p); p->p_stats->p_ru.ru_nivcsw++; mi_switch(); mtx_exit(&sched_lock, MTX_SPIN); + PICKUP_GIANT(); splx(s); while ((sig = CURSIG(p)) != 0) { if (have_giant == 0) { |
