From 546c9ed396678269e4bf2af437c13974a0d3874a Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Sat, 7 Mar 1998 15:43:43 +0000
Subject: [PATCH] Sync with sys/i386/isa/clock.c revision 1.115.

---
 sys/pc98/cbus/clock.c | 12 ++++++------
 sys/pc98/cbus/pcrtc.c | 12 ++++++------
 sys/pc98/pc98/clock.c | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 2d1b968116fb..efa4296535c1 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.46 1998/02/23 12:24:27 kato Exp $
+ *	$Id: clock.c,v 1.47 1998/03/01 05:22:25 kato Exp $
  */
 
 /*
@@ -97,6 +97,9 @@
 #ifdef SMP
 #define disable_intr()	CLOCK_DISABLE_INTR()
 #define enable_intr()	CLOCK_ENABLE_INTR()
+
+/* The interrupt triggered by the 8254 (timer) chip */
+int apic_8254_intr;
 #endif /* SMP */
 
 /*
@@ -1245,15 +1248,12 @@ cpu_initclocks()
 	else 
 		panic("neither pin 0 or pin 2 works for 8254");
 
-	/* setup the vectors */
-	vec[x] = (u_int)vec8254;
-	Xintr8254 = (u_int)ivectors[x];
-	mask8254 = (1 << x);
+	apic_8254_intr = x; 
 
 	register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0,
 		      /* XXX */ (inthand2_t *)clkintr, &clk_imask,
 		      /* unit */ 0);
-	INTREN(mask8254);
+	INTREN(1 << x);
 
 #else /* APIC_IO */
 
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 2d1b968116fb..efa4296535c1 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.46 1998/02/23 12:24:27 kato Exp $
+ *	$Id: clock.c,v 1.47 1998/03/01 05:22:25 kato Exp $
  */
 
 /*
@@ -97,6 +97,9 @@
 #ifdef SMP
 #define disable_intr()	CLOCK_DISABLE_INTR()
 #define enable_intr()	CLOCK_ENABLE_INTR()
+
+/* The interrupt triggered by the 8254 (timer) chip */
+int apic_8254_intr;
 #endif /* SMP */
 
 /*
@@ -1245,15 +1248,12 @@ cpu_initclocks()
 	else 
 		panic("neither pin 0 or pin 2 works for 8254");
 
-	/* setup the vectors */
-	vec[x] = (u_int)vec8254;
-	Xintr8254 = (u_int)ivectors[x];
-	mask8254 = (1 << x);
+	apic_8254_intr = x; 
 
 	register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0,
 		      /* XXX */ (inthand2_t *)clkintr, &clk_imask,
 		      /* unit */ 0);
-	INTREN(mask8254);
+	INTREN(1 << x);
 
 #else /* APIC_IO */
 
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 2d1b968116fb..efa4296535c1 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.46 1998/02/23 12:24:27 kato Exp $
+ *	$Id: clock.c,v 1.47 1998/03/01 05:22:25 kato Exp $
  */
 
 /*
@@ -97,6 +97,9 @@
 #ifdef SMP
 #define disable_intr()	CLOCK_DISABLE_INTR()
 #define enable_intr()	CLOCK_ENABLE_INTR()
+
+/* The interrupt triggered by the 8254 (timer) chip */
+int apic_8254_intr;
 #endif /* SMP */
 
 /*
@@ -1245,15 +1248,12 @@ cpu_initclocks()
 	else 
 		panic("neither pin 0 or pin 2 works for 8254");
 
-	/* setup the vectors */
-	vec[x] = (u_int)vec8254;
-	Xintr8254 = (u_int)ivectors[x];
-	mask8254 = (1 << x);
+	apic_8254_intr = x; 
 
 	register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0,
 		      /* XXX */ (inthand2_t *)clkintr, &clk_imask,
 		      /* unit */ 0);
-	INTREN(mask8254);
+	INTREN(1 << x);
 
 #else /* APIC_IO */