Index: sys/amd64/amd64/initcpu.c
===================================================================
--- sys/amd64/amd64/initcpu.c	(revision 217356)
+++ sys/amd64/amd64/initcpu.c	(working copy)
@@ -169,6 +169,9 @@ void
 initializecpucache()
 {
 
+	/* Turn on normal cache mode. */
+	load_cr0(rcr0() & ~(CR0_CD | CR0_NW));
+
 	/*
 	 * CPUID with %eax = 1, %ebx returns
 	 * Bits 15-8: CLFLUSH line size
Index: sys/i386/i386/initcpu.c
===================================================================
--- sys/i386/i386/initcpu.c	(revision 217356)
+++ sys/i386/i386/initcpu.c	(working copy)
@@ -532,7 +532,6 @@ init_mendocino(void)
 		wrmsr(MSR_BBL_CR_CTL3, bbl_cr_ctl3);
 	}
 
-	load_cr0(rcr0() & ~(CR0_CD | CR0_NW));
 	intr_restore(saveintr);
 #endif /* CPU_PPRO2CELERON */
 }
@@ -701,6 +700,8 @@ initializecpu(void)
 			pg_nx = PG_NX;
 		}
 #endif
+		/* Turn on normal cache mode. */
+		load_cr0(rcr0() & ~(CR0_CD | CR0_NW));
 		break;
 #endif
 	default: