From 016f33ea47ed00e3f6c46b82515f37960bc9d400 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Tue, 28 Oct 1997 14:30:47 +0000
Subject: [PATCH] Synchronize with sys/i386/isa/npx.c and clock.c revisions
 1.53 and 1.103, respectively.

---
 sys/pc98/cbus/clock.c | 7 +++++--
 sys/pc98/cbus/pcrtc.c | 7 +++++--
 sys/pc98/pc98/clock.c | 7 +++++--
 sys/pc98/pc98/npx.c   | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 2a757106caf..1c9bf8ba714 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.34 1997/08/30 15:47:46 kato Exp $
+ *	$Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
  */
 
 /*
@@ -65,10 +65,13 @@
 #ifdef CLK_CALIBRATION_LOOP
 #include <machine/cons.h>
 #endif
-#include <machine/cpu.h>
+#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
 #include <machine/limits.h>
+#ifdef APIC_IO
+#include <machine/segments.h>
+#endif
 #if defined(SMP) || defined(APIC_IO)
 #include <machine/smp.h>
 #endif /* SMP || APIC_IO */
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 2a757106caf..1c9bf8ba714 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.34 1997/08/30 15:47:46 kato Exp $
+ *	$Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
  */
 
 /*
@@ -65,10 +65,13 @@
 #ifdef CLK_CALIBRATION_LOOP
 #include <machine/cons.h>
 #endif
-#include <machine/cpu.h>
+#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
 #include <machine/limits.h>
+#ifdef APIC_IO
+#include <machine/segments.h>
+#endif
 #if defined(SMP) || defined(APIC_IO)
 #include <machine/smp.h>
 #endif /* SMP || APIC_IO */
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 2a757106caf..1c9bf8ba714 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.34 1997/08/30 15:47:46 kato Exp $
+ *	$Id: clock.c,v 1.35 1997/09/01 10:44:06 kato Exp $
  */
 
 /*
@@ -65,10 +65,13 @@
 #ifdef CLK_CALIBRATION_LOOP
 #include <machine/cons.h>
 #endif
-#include <machine/cpu.h>
+#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
 #include <machine/limits.h>
+#ifdef APIC_IO
+#include <machine/segments.h>
+#endif
 #if defined(SMP) || defined(APIC_IO)
 #include <machine/smp.h>
 #endif /* SMP || APIC_IO */
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index 16200c21d30..8960f7d849f 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.26 1997/08/18 11:30:05 kato Exp $
+ *	$Id: npx.c,v 1.27 1997/08/21 10:13:12 kato Exp $
  */
 
 #include "npx.h"
@@ -53,12 +53,15 @@
 #include <sys/signalvar.h>
 
 #include <machine/asmacros.h>
-#include <machine/cpu.h>
+#include <machine/cputypes.h>
+#include <machine/frame.h>
 #include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
+#include <machine/psl.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
+#include <machine/segments.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa_device.h>