--- src.o/sys/i386/i386/trap.c	Sun Mar 25 01:25:54 2007
+++ src/sys/i386/i386/trap.c	Mon Mar 26 09:36:07 2007
@@ -916,20 +916,13 @@
 	u_int code;
 	ksiginfo_t ksi;
 
+	KASSERT(ISPL(frame->tf_cs) == SEL_UPL, ("ISPL != SEL_UPL"));
+
 	/*
 	 * note: PCPU_LAZY_INC() can only be used if we can afford
 	 * occassional inaccuracy in the count.
 	 */
 	PCPU_LAZY_INC(cnt.v_syscall);
-
-#ifdef DIAGNOSTIC
-	if (ISPL(frame->tf_cs) != SEL_UPL) {
-		mtx_lock(&Giant);	/* try to stabilize the system XXX */
-		panic("syscall");
-		/* NOT REACHED */
-		mtx_unlock(&Giant);
-	}
-#endif
 
 	td->td_pticks = 0;
 	td->td_frame = frame;
--- src.o/sys/amd64/amd64/trap.c	Sun Mar 25 01:24:40 2007
+++ src/sys/amd64/amd64/trap.c	Mon Mar 26 09:36:16 2007
@@ -737,20 +737,13 @@
 	int reg, regcnt;
 	ksiginfo_t ksi;
 
+	KASSERT(ISPL(frame->tf_cs) == SEL_UPL, ("ISPL != SEL_UPL"));
+
 	/*
 	 * note: PCPU_LAZY_INC() can only be used if we can afford
 	 * occassional inaccuracy in the count.
 	 */
 	PCPU_LAZY_INC(cnt.v_syscall);
-
-#ifdef DIAGNOSTIC
-	if (ISPL(frame->tf_cs) != SEL_UPL) {
-		mtx_lock(&Giant);	/* try to stabilize the system XXX */
-		panic("syscall");
-		/* NOT REACHED */
-		mtx_unlock(&Giant);
-	}
-#endif
 
 	reg = 0;
 	regcnt = 6;