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
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.67.4.4
retrieving revision 1.82.4.3
diff -u -p -r1.67.4.4 -r1.82.4.3
--- src/sys/arch/i386/i386/locore.S	2009/08/19 18:46:19	1.67.4.4
+++ src/sys/arch/i386/i386/locore.S	2011/03/28 23:04:40	1.82.4.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.67.4.4 2009/08/19 18:46:19 yamt Exp $	*/
+/*	$NetBSD: locore.S,v 1.82.4.3 2011/03/28 23:04:40 jym Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -15,11 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -134,7 +129,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.67.4.4 2009/08/19 18:46:19 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.82.4.3 2011/03/28 23:04:40 jym Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
@@ -984,7 +979,7 @@ ENTRY(cpu_switchto)
 	/* Switch I/O bitmap */
 	movl	PCB_IOMAP(%ebx),%eax
 	orl	%eax,%eax
-	jnz,pn	.Lcopy_iobitmap
+	jnz	.Lcopy_iobitmap
 	movl	$(IOMAP_INVALOFF << 16),CPUVAR(IOBASE)
 .Liobitmap_done: