diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index a321639ff491..b6c69a00aa94 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -127,7 +127,7 @@ static	void	npx_intr	__P((void *));
 #endif
 static	int	npx_probe	__P((device_t dev));
 static	int	npx_probe1	__P((device_t dev));
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static	long	timezero	__P((const char *funcname,
 				     void (*func)(void *buf, size_t len)));
 #endif /* I586_CPU */
@@ -881,7 +881,7 @@ npxsave(addr)
 	PCPU_SET(npxproc, NULL);
 }
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static long
 timezero(funcname, func)
 	const char *funcname;
@@ -904,7 +904,7 @@ timezero(funcname, func)
 	if (usec <= 0)
 		usec = 1;
 	if (bootverbose)
-		printf("%s bandwidth = %lu kBps\n", funcname,
+		printf("%s bandwidth = %u kBps\n", funcname,
 		    (u_int32_t)(((BUFSIZE >> 10) * 1000000) / usec));
 	free(buf, M_TEMP);
 	return (usec);
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index a321639ff491..b6c69a00aa94 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -127,7 +127,7 @@ static	void	npx_intr	__P((void *));
 #endif
 static	int	npx_probe	__P((device_t dev));
 static	int	npx_probe1	__P((device_t dev));
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static	long	timezero	__P((const char *funcname,
 				     void (*func)(void *buf, size_t len)));
 #endif /* I586_CPU */
@@ -881,7 +881,7 @@ npxsave(addr)
 	PCPU_SET(npxproc, NULL);
 }
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static long
 timezero(funcname, func)
 	const char *funcname;
@@ -904,7 +904,7 @@ timezero(funcname, func)
 	if (usec <= 0)
 		usec = 1;
 	if (bootverbose)
-		printf("%s bandwidth = %lu kBps\n", funcname,
+		printf("%s bandwidth = %u kBps\n", funcname,
 		    (u_int32_t)(((BUFSIZE >> 10) * 1000000) / usec));
 	free(buf, M_TEMP);
 	return (usec);
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index a321639ff491..b6c69a00aa94 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -127,7 +127,7 @@ static	void	npx_intr	__P((void *));
 #endif
 static	int	npx_probe	__P((device_t dev));
 static	int	npx_probe1	__P((device_t dev));
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static	long	timezero	__P((const char *funcname,
 				     void (*func)(void *buf, size_t len)));
 #endif /* I586_CPU */
@@ -881,7 +881,7 @@ npxsave(addr)
 	PCPU_SET(npxproc, NULL);
 }
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 static long
 timezero(funcname, func)
 	const char *funcname;
@@ -904,7 +904,7 @@ timezero(funcname, func)
 	if (usec <= 0)
 		usec = 1;
 	if (bootverbose)
-		printf("%s bandwidth = %lu kBps\n", funcname,
+		printf("%s bandwidth = %u kBps\n", funcname,
 		    (u_int32_t)(((BUFSIZE >> 10) * 1000000) / usec));
 	free(buf, M_TEMP);
 	return (usec);