Author: jhb
Date: Fri Jun 10 18:58:32 2011
New Revision: 222940
URL: http://svn.freebsd.org/changeset/base/222940
Log:
MFC 222252:
Simplify a stale assertion. We have not called mi_switch() from a nested
critical section during a preemption for several years.
Modified:
stable/8/sys/kern/kern_synch.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/kern/kern_synch.c
==============================================================================
--- stable/8/sys/kern/kern_synch.c Fri Jun 10 18:56:12 2011
(r222939)
+++ stable/8/sys/kern/kern_synch.c Fri Jun 10 18:58:32 2011
(r222940)
@@ -400,9 +400,7 @@ mi_switch(int flags, struct thread *newt
if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td))
mtx_assert(&Giant, MA_NOTOWNED);
#endif
- KASSERT(td->td_critnest == 1 || (td->td_critnest == 2 &&
- (td->td_owepreempt) && (flags & SW_INVOL) != 0 &&
- newtd == NULL) || panicstr,
+ KASSERT(td->td_critnest == 1 || panicstr,
("mi_switch: switch in a critical section"));
KASSERT((flags & (SW_INVOL | SW_VOL)) != 0,
("mi_switch: switch must be voluntary or involuntary"));
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
