summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_exit.c
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2008-02-17 15:28:28 +0000
committerkris <kris@FreeBSD.org>2008-02-17 15:28:28 +0000
commit869799580497fabd00e4a119fd0112acb0202561 (patch)
tree5a50e151167617eda352038f3fc42df4c5b45c51 /sys/kern/kern_exit.c
parent51d69a452f92eab4dee650532faab8205bb8b54d (diff)
downloadFreeBSD-src-869799580497fabd00e4a119fd0112acb0202561.zip
FreeBSD-src-869799580497fabd00e4a119fd0112acb0202561.tar.gz
Switch from conditionally dropping Giant in exit1() to asserting it is
not held, which appears to be always true.
Diffstat (limited to 'sys/kern/kern_exit.c')
-rw-r--r--sys/kern/kern_exit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 46bbaa5..910f742 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -118,12 +118,7 @@ exit1(struct thread *td, int rv)
struct plimit *plim;
int locked;
- /*
- * Drop Giant if caller has it. Eventually we should warn about
- * being called with Giant held.
- */
- while (mtx_owned(&Giant))
- mtx_unlock(&Giant);
+ mtx_assert(&Giant, MA_NOTOWNED);
p = td->td_proc;
if (p == initproc) {
OpenPOWER on IntegriCloud