summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>2000-09-12 18:41:56 +0000
committerBruce Evans <bde@FreeBSD.org>2000-09-12 18:41:56 +0000
commitbbbb2579b4e853bf101abefcf23f1b61204ae3b0 (patch)
treeb093f220e24f7459c9df28a403c505e0cd86b821 /sys/kern
parent96cae770d36db1bb659996da62320122ca098e72 (diff)
Notes
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_trap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index f32dfaeeddc0..d49327fa9816 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -279,7 +279,8 @@ trap(frame)
enable_intr();
}
- mtx_enter(&Giant, MTX_DEF);
+ if (p != NULL || !cold)
+ mtx_enter(&Giant, MTX_DEF);
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
restart:
@@ -639,7 +640,8 @@ restart:
user:
userret(p, &frame, sticks, 1);
out:
- mtx_exit(&Giant, MTX_DEF);
+ if (p != NULL || !cold)
+ mtx_exit(&Giant, MTX_DEF);
}
#ifdef notyet