diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 56e23a02d6d2..6ec273857214 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -455,7 +455,7 @@ npx_attach(dev)
 	}
 	npxinit(__INITIAL_NPXCW__);
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 	if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists &&
 	    timezero("i586_bzero()", i586_bzero) <
 	    timezero("bzero()", bzero) * 4 / 5) {
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 56e23a02d6d2..6ec273857214 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -455,7 +455,7 @@ npx_attach(dev)
 	}
 	npxinit(__INITIAL_NPXCW__);
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 	if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists &&
 	    timezero("i586_bzero()", i586_bzero) <
 	    timezero("bzero()", bzero) * 4 / 5) {
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 56e23a02d6d2..6ec273857214 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -455,7 +455,7 @@ npx_attach(dev)
 	}
 	npxinit(__INITIAL_NPXCW__);
 
-#ifdef I586_CPU
+#ifdef I586_CPU_XXX
 	if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists &&
 	    timezero("i586_bzero()", i586_bzero) <
 	    timezero("bzero()", bzero) * 4 / 5) {