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/cpufunc.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/cpufunc.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- src/sys/arch/i386/i386/cpufunc.S	2008/05/10 16:21:41	1.11
+++ src/sys/arch/i386/i386/cpufunc.S	2008/05/25 15:56:12	1.12
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.S,v 1.11 2008/05/10 16:21:41 ad Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.12 2008/05/25 15:56:12 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.11 2008/05/10 16:21:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.12 2008/05/25 15:56:12 chs Exp $");
 
 #include "opt_xen.h"
 
@@ -89,13 +89,13 @@ ENTRY(rcr4)
 	ret
 END(rcr4)
 
-NENTRY(x86_read_flags)
+ENTRY(x86_read_flags)
 	pushfl
 	popl	%eax
 	ret
 END(x86_read_flags)
 
-NENTRY(x86_write_flags)
+ENTRY(x86_write_flags)
 	movl	4(%esp), %eax
 	pushl	%eax
 	popfl
@@ -160,7 +160,7 @@ ENTRY(rdpmc)
 	ret
 END(rdpmc)
 
-NENTRY(breakpoint)
+ENTRY(breakpoint)
 	pushl	%ebp
 	movl	%esp, %ebp
 	int	$0x03		/* paranoid, not 'int3' */
@@ -168,21 +168,21 @@ NENTRY(breakpoint)
 	ret
 END(breakpoint)
 
-NENTRY(x86_atomic_testset_ul)
+ENTRY(x86_atomic_testset_ul)
 	movl	4(%esp), %ecx
 	movl	8(%esp), %eax
 	xchgl	%eax, (%ecx)
 	ret
 END(x86_atomic_testset_ul)
 
-NENTRY(x86_atomic_testset_i)
+ENTRY(x86_atomic_testset_i)
 	movl	4(%esp), %ecx
 	movl	8(%esp), %eax
 	xchgl	%eax, (%ecx)
 	ret
 END(x86_atomic_testset_i)
 
-NENTRY(x86_atomic_testset_b)
+ENTRY(x86_atomic_testset_b)
 	movl	4(%esp), %ecx
 	movl	8(%esp), %eax
 	xchgb	%al, (%ecx)
@@ -190,7 +190,7 @@ NENTRY(x86_atomic_testset_b)
 	ret
 END(x86_atomic_testset_b)
 
-NENTRY(x86_atomic_setbits_l)
+ENTRY(x86_atomic_setbits_l)
 	movl	4(%esp), %ecx
 	movl	8(%esp), %eax
 	lock
@@ -198,7 +198,7 @@ NENTRY(x86_atomic_setbits_l)
 	ret
 END(x86_atomic_setbits_l)
 
-NENTRY(x86_atomic_clearbits_l)
+ENTRY(x86_atomic_clearbits_l)
 	movl	4(%esp), %ecx
 	movl	8(%esp), %eax
 	notl	%eax
@@ -207,17 +207,17 @@ NENTRY(x86_atomic_clearbits_l)
 	ret
 END(x86_atomic_clearbits_l)
 
-NENTRY(x86_curcpu)
+ENTRY(x86_curcpu)
 	movl	%fs:(CPU_INFO_SELF), %eax
 	ret
 END(x86_curcpu)
 
-NENTRY(x86_curlwp)
+ENTRY(x86_curlwp)
 	movl	%fs:(CPU_INFO_CURLWP), %eax
 	ret
 END(x86_curlwp)
 
-NENTRY(cpu_set_curpri)
+ENTRY(cpu_set_curpri)
 	movl	4(%esp), %eax
 	movl	%eax, %fs:(CPU_INFO_CURPRIORITY)
 	ret
@@ -240,7 +240,7 @@ END(__byte_swap_u16_variable)
  *
  * Flush instruction pipelines by doing an intersegment (far) return.
  */
-NENTRY(x86_flush)
+ENTRY(x86_flush)
 	popl	%eax
 	pushl	$GSEL(GCODE_SEL, SEL_KPL)
 	pushl	%eax
@@ -248,7 +248,7 @@ NENTRY(x86_flush)
 END(x86_flush)
 
 /* Waits - set up stack frame. */
-NENTRY(x86_hlt)
+ENTRY(x86_hlt)
 	pushl	%ebp
 	movl	%esp, %ebp
 	hlt
@@ -257,7 +257,7 @@ NENTRY(x86_hlt)
 END(x86_hlt)
 
 /* Waits - set up stack frame. */
-NENTRY(x86_stihlt)
+ENTRY(x86_stihlt)
 	pushl	%ebp
 	movl	%esp, %ebp
 	sti
@@ -266,7 +266,7 @@ NENTRY(x86_stihlt)
 	ret
 END(x86_stihlt)
 
-NENTRY(x86_monitor)
+ENTRY(x86_monitor)
 	movl	4(%esp), %eax
 	movl	8(%esp), %ecx
 	movl	12(%esp), %edx
@@ -275,7 +275,7 @@ NENTRY(x86_monitor)
 END(x86_monitor)
 
 /* Waits - set up stack frame. */
-NENTRY(x86_mwait)  
+ENTRY(x86_mwait)  
 	pushl	%ebp
 	movl	%esp, %ebp
 	movl	8(%ebp), %eax
@@ -285,7 +285,7 @@ NENTRY(x86_mwait)  
 	ret
 END(x86_mwait)  
 
-NENTRY(x86_pause)
+ENTRY(x86_pause)
 	pause
 	ret
 END(x86_pause)
@@ -364,12 +364,12 @@ ENTRY(fwait)
 	ret
 END(fwait)
 
-NENTRY(clts)
+ENTRY(clts)
 	clts
 	ret
 END(clts)
 
-NENTRY(stts)
+ENTRY(stts)
 	movl	%cr0, %eax
 	orl	$CR0_TS, %eax
 	movl	%eax, %cr0