From 9f32d6e237fb68c335a089e768436747d9d1ce4f Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 2 Nov 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-11-02

---
 carrera/trap.c | 10 +++-------
 pc/clock.c     | 14 +++++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/carrera/trap.c b/carrera/trap.c
index deab279d5404bee34e31934f8067c472093f8289..f95beee39e9e811723b0c2468b99f2705ac43dfa 100644
--- a/carrera/trap.c
+++ b/carrera/trap.c
@@ -382,13 +382,9 @@ intr(Ureg *ur)
 			eisadmaintr();
 			break;
 		}
-		/* reenable the 8259 interrupt */
-		vec = devint&~0x7;
-		if(vec == Int0vec || vec == Int1vec){
-			EISAOUTB(Int0ctl, EOI);
-			if(vec == Int1vec)
-				EISAOUTB(Int1ctl, EOI);
-		}
+		EISAOUTB(Int0ctl, EOI);
+		if(devint > 7)
+			EISAOUTB(Int1ctl, EOI);
 		cause &= ~INTR4;
 	}
 
diff --git a/pc/clock.c b/pc/clock.c
index 190a852ac47ebe77f97872918dfff255b4752af5..0c0a486235d87924ce68d06d029591e2658fc156 100644
--- a/pc/clock.c
+++ b/pc/clock.c
@@ -94,18 +94,18 @@ typedef struct
 X86type x86type[] =
 {
 	/* from the cpuid instruction */
-	{ 4,	0,	22,	"Intel486DX", },
-	{ 4,	1,	22,	"Intel486DX", },
-	{ 4,	2,	22,	"Intel486SX", },
-	{ 4,	4,	22,	"Intel486DX2", },
-	{ 4,	5,	22,	"Intel486SL", },
-	{ 4,	8,	22,	"IntelDX4", },
+	{ 4,	0,	24,	"Intel486DX", },
+	{ 4,	1,	24,	"Intel486DX", },
+	{ 4,	2,	24,	"Intel486SX", },
+	{ 4,	4,	24,	"Intel486DX2", },
+	{ 4,	5,	24,	"Intel486SL", },
+	{ 4,	8,	24,	"IntelDX4", },
 	{ 5,	1,	23,	"Pentium510", },
 	{ 5,	2,	23,	"Pentium735", },
 
 	/* family defaults */
 	{ 3,	-1,	32,	"Intel386", },
-	{ 4,	-1,	22,	"Intel486", },
+	{ 4,	-1,	24,	"Intel486", },
 	{ 5,	-1,	23,	"Pentium", },
 
 	/* total default */