--- src/sys/i386/i386/Attic/trap.c	2005/12/24 20:34:04	1.72
+++ src/sys/i386/i386/Attic/trap.c	2006/02/17 06:01:24	1.73
@@ -1883,8 +1883,8 @@ bad:
 
 	userexit(lp);
 #ifdef SMP
-	KASSERT(td->td_mpcount == 1, ("badmpcount waitsys/end from %p",
-	        (void *)frame.tf_eip));
+	KASSERT(td->td_mpcount == have_mplock, 
+		("badmpcount waitsys/end from %p", (void *)frame.tf_eip));
 	if (have_mplock)
 		rel_mplock();
 #endif