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/amd64/amd64/cpufunc.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/amd64/cpufunc.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.6.3
retrieving revision 1.1.6.4
diff -u -p -r1.1.6.3 -r1.1.6.4
--- src/sys/arch/amd64/amd64/cpufunc.S	2007/12/03 18:34:36	1.1.6.3
+++ src/sys/arch/amd64/amd64/cpufunc.S	2007/12/03 19:02:31	1.1.6.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.S,v 1.1.6.3 2007/12/03 18:34:36 ad Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.1.6.4 2007/12/03 19:02:31 ad Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -46,8 +46,6 @@
 
 #include "opt_xen.h"
 
-#include "opt_xen.h"
-
 #include "assym.h"
 
 /* Small and slow, so align less. */
@@ -98,7 +96,6 @@ NENTRY(rcr2)
 NENTRY(lcr3)
 	movq	%rdi, %cr3
 	ret
-#endif
 
 NENTRY(rcr3)
 	movq	%cr3, %rax