Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- src/sys/arch/i386/i386/locore.S	2008/04/28 20:23:24	1.69
+++ src/sys/arch/i386/i386/locore.S	2008/04/29 18:27:18	1.70
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.69 2008/04/28 20:23:24 martin Exp $	*/
+/*	$NetBSD: locore.S,v 1.70 2008/04/29 18:27:18 ad Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -134,7 +134,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.69 2008/04/28 20:23:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.70 2008/04/29 18:27:18 ad Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
@@ -907,6 +907,16 @@ ENTRY(cpu_switchto)
 	pushl	%esi
 	pushl	%edi
 
+#if defined(DIAGNOSTIC) && !defined(XEN)
+	cmpl	$IPL_SCHED,CPUVAR(ILEVEL)
+	jbe	0f
+	pushl	$.Lstr
+	call	_C_LABEL(panic)
+	addl	$4,%esp
+.Lstr:	.string	"cpu_switcho: switching above IPL_SCHED\0"
+0:
+#endif
+
 	movl	16(%esp),%esi		# oldlwp
 	movl	20(%esp),%edi		# newlwp
 	movl	24(%esp),%edx		# returning