--- arch/i386/i386/machdep.c-	Fri Apr 28 14:25:05 2000
+++ arch/i386/i386/machdep.c	Wed Jun 28 13:45:18 2000
@@ -2514,10 +2514,18 @@
 		pmap_enter(pmap_kernel(), va, pa,
 		    VM_PROT_READ | VM_PROT_WRITE, TRUE,
 		    VM_PROT_READ | VM_PROT_WRITE);
-		if (!cacheable)
-			pmap_changebit(pa, PG_N, ~0);
-		else
-			pmap_changebit(pa, 0, ~PG_N);
+
+		/*
+		 * PG_N doesn't exist on 386's, so we assume that
+		 * the mainboard has wired up device space non-cacheable
+		 * on those machines.
+		 */
+		if (cpu_class != CPUCLASS_386) {
+			if (!cacheable)
+				pmap_changebit(pa, PG_N, ~0);
+			else
+				pmap_changebit(pa, 0, ~PG_N);
+		}
 	}
  
 	return 0;