aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/kern_synch.c
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2003-05-05 21:12:36 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2003-05-05 21:12:36 +0000
commite668d8d834ceb268882420c23fa79645c77d7e48 (patch)
treed2ec975cd0f6dd8faef3b6e3ac4e6b401f4d6771 /sys/kern/kern_synch.c
parent710c5645af50ad6618edf08c7715184d5a9b21fd (diff)
downloadsrc-e668d8d834ceb268882420c23fa79645c77d7e48.tar.gz
src-e668d8d834ceb268882420c23fa79645c77d7e48.zip
Remove TD_ON_RUNQ() from a check to make sure Giant is not held when
calling mi_switch(). The kernel would panic on an earlier KASSERT() in mi_switch() if TD_ON_RUNQ() was true.
Notes
Notes: svn path=/head/; revision=114750
Diffstat (limited to 'sys/kern/kern_synch.c')
-rw-r--r--sys/kern/kern_synch.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 914f43ef9c22..d648e9e311e9 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -467,9 +467,7 @@ mi_switch(void)
p = td->td_proc; /* XXX */
KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code"));
#ifdef INVARIANTS
- if (!TD_ON_LOCK(td) &&
- !TD_ON_RUNQ(td) &&
- !TD_IS_RUNNING(td))
+ if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td))
mtx_assert(&Giant, MA_NOTOWNED);
#endif
KASSERT(td->td_critnest == 1,