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.34.2.10
retrieving revision 1.65
diff -u -p -r1.34.2.10 -r1.65
--- src/sys/arch/i386/i386/locore.S	2008/03/17 09:14:20	1.34.2.10
+++ src/sys/arch/i386/i386/locore.S	2008/01/21 08:22:42	1.65
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.34.2.10 2008/03/17 09:14:20 yamt Exp $	*/
+/*	$NetBSD: locore.S,v 1.65 2008/01/21 08:22:42 skrll Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -141,7 +141,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.34.2.10 2008/03/17 09:14:20 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.65 2008/01/21 08:22:42 skrll Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
@@ -192,9 +192,6 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
 	.ascii  ",HYPERCALL_PAGE=0x00000101"
 		/* (???+HYPERCALL_PAGE_OFFSET)/PAGE_SIZE) */
 #endif
-#ifdef PAE
-	.ascii  ",PAE=yes[extended-cr3]"
-#endif
 #else /* !XEN3 */
 	.ascii	"GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0"
 #endif /* XEN3 */
@@ -1090,7 +1087,6 @@ syscall1:
 1:
 #endif /* DIAGNOSTIC */
 	movl	CPUVAR(CURLWP),%edx
-	incl	CPUVAR(NSYSCALL)	# count it atomically
 	movl	%esp,L_MD_REGS(%edx)	# save pointer to frame
 	movl	L_PROC(%edx),%edx
 	pushl	%esp