--- src/sys/i386/i386/Attic/trap.c	2005/11/22 01:52:25	1.70
+++ src/sys/i386/i386/Attic/trap.c	2005/11/22 08:41:00	1.71
@@ -494,8 +494,13 @@ restart:
 				/*
 				 * returns to original process
 				 */
-				vm86_trap((struct vm86frame *)&frame);
-				KKASSERT(0);
+#ifdef SMP
+				vm86_trap((struct vm86frame *)&frame,
+					  have_mplock);
+#else
+				vm86_trap((struct vm86frame *)&frame, 0);
+#endif
+				KKASSERT(0); /* NOT REACHED */
 			}
 			goto out2;
 		}
@@ -880,7 +885,6 @@ out:
 	userexit(lp);
 out2:	;
 #ifdef SMP
-	KKASSERT(td->td_mpcount >= have_mplock);
 	if (have_mplock)
 		rel_mplock();
 #endif