diff --git a/sys/arch/amd64/amd64/fpu.c b/sys/arch/amd64/amd64/fpu.c
index 631413fd9f67..a8fa073d945b 100644
--- a/sys/arch/amd64/amd64/fpu.c
+++ b/sys/arch/amd64/amd64/fpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.23 2008/04/16 21:51:02 cegger Exp $	*/
+/*	$NetBSD: fpu.c,v 1.24 2008/04/30 00:16:30 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.23 2008/04/16 21:51:02 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.24 2008/04/30 00:16:30 cegger Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -220,7 +220,7 @@ fpudna(struct cpu_info *ci)
 	int s;
 
 	if (ci->ci_fpsaving) {
-		printf("recursive fpu trap; cr0=%x\n", rcr0());
+		printf("recursive fpu trap; cr0=%lx\n", rcr0());
 		return;
 	}
 
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 10a447eb5cfe..cb26916f8450 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npx.c,v 1.128 2008/04/28 18:15:39 ad Exp $	*/
+/*	$NetBSD: npx.c,v 1.129 2008/04/30 00:16:30 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.128 2008/04/28 18:15:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.129 2008/04/30 00:16:30 cegger Exp $");
 
 #if 0
 #define IPRINTF(x)	printf x
@@ -539,7 +539,7 @@ npxdna_xmm(struct cpu_info *ci)
 
 	if (ci->ci_fpsaving) {
 #ifndef XEN
-		printf("recursive npx trap; cr0=%x\n", rcr0());
+		printf("recursive npx trap; cr0=%lx\n", rcr0());
 		kpreempt_enable();
 		return (0);
 #else
@@ -632,7 +632,7 @@ npxdna_s87(struct cpu_info *ci)
 
 	if (ci->ci_fpsaving) {
 #ifndef XEN
-		printf("recursive npx trap; cr0=%x\n", rcr0());
+		printf("recursive npx trap; cr0=%lx\n", rcr0());
 		kpreempt_enable();
 		return (0);
 #else
diff --git a/sys/arch/x86/include/cpufunc.h b/sys/arch/x86/include/cpufunc.h
index b3c9feaf8205..0336e4947a56 100644
--- a/sys/arch/x86/include/cpufunc.h
+++ b/sys/arch/x86/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.7 2008/04/28 20:23:40 martin Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.8 2008/04/30 00:16:30 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -54,8 +54,8 @@ void	invlpg(vaddr_t);
 void	lidt(struct region_descriptor *);
 void	lldt(u_short);
 void	ltr(u_short);
-void	lcr0(u_int);
-u_int	rcr0(void);
+void	lcr0(u_long);
+u_long	rcr0(void);
 void	lcr2(vaddr_t);
 vaddr_t	rcr2(void);
 void	lcr3(vaddr_t);
diff --git a/sys/arch/xen/x86/xenfunc.c b/sys/arch/xen/x86/xenfunc.c
index 1d1b0f74f2f2..9f992cdc2ac8 100644
--- a/sys/arch/xen/x86/xenfunc.c
+++ b/sys/arch/xen/x86/xenfunc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenfunc.c,v 1.5 2008/04/21 15:15:34 cegger Exp $	*/
+/*	$NetBSD: xenfunc.c,v 1.6 2008/04/30 00:16:30 cegger Exp $	*/
 
 /*
  *
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.5 2008/04/21 15:15:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.6 2008/04/30 00:16:30 cegger Exp $");
 
 #include <sys/param.h>
 
@@ -85,12 +85,12 @@ ltr(u_short sel)
 }
 
 void
-lcr0(u_int val)
+lcr0(u_long val)
 {
 	__PRINTK(("XXX lcr0 not supported\n"));
 }
 
-u_int
+u_long
 rcr0(void)
 {
 	__PRINTK(("XXX rcr0 not supported\n"));