From fcbdfa9a2f46314d45294fb67d5541e1b41fa0d5 Mon Sep 17 00:00:00 2001
From: Michael Knudsen <mk@cvs.openbsd.org>
Date: Fri, 20 Jul 2007 17:04:15 +0000
Subject: Oh, look, code that begins like this:

	if (cpu_class != CPUCLASS_386) {

Since we don't support 386 now, unconditionally execute the block.

ok tom toby
---
 sys/arch/i386/i386/machdep.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'sys/arch/i386')

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index a941f9ededd..4b5678ab52f 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.402 2007/06/07 11:20:58 dim Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.403 2007/07/20 17:04:14 mk Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -3524,19 +3524,12 @@ bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int cacheable,
 	    pa += PAGE_SIZE, va += PAGE_SIZE, map_size -= PAGE_SIZE) {
 		pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
 
-		/*
-		 * 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) {
-			pte = kvtopte(va);
-			if (cacheable)
-				*pte &= ~PG_N;
-			else
-				*pte |= PG_N;
-			pmap_tlb_shootpage(pmap_kernel(), va);
-		}
+		pte = kvtopte(va);
+		if (cacheable)
+			*pte &= ~PG_N;
+		else
+			*pte |= PG_N;
+		pmap_tlb_shootpage(pmap_kernel(), va);
 	}
 
 	pmap_tlb_shootwait();
-- 
cgit v1.2.3