From ecf15560c7d2c805ea3ba8aeb660f3e54a7b199e Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Tue, 24 Sep 2002 03:17:38 +0000
Subject: [PATCH] MFi386: revisions 1.127, 1.128 and 1.129.

---
 sys/pc98/apm/apm.c | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/sys/pc98/apm/apm.c b/sys/pc98/apm/apm.c
index e30605dcda8..914be4ee7c2 100644
--- a/sys/pc98/apm/apm.c
+++ b/sys/pc98/apm/apm.c
@@ -20,35 +20,36 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/eventhandler.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/reboot.h>
 #include <sys/bus.h>
-#include <sys/selinfo.h>
-#include <sys/poll.h>
+#include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/poll.h>
+#include <sys/power.h>
+#include <sys/reboot.h>
+#include <sys/selinfo.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
-#include <sys/power.h>
-#include <machine/apm_bios.h>
-#include <machine/segments.h>
-#include <machine/clock.h>
-#include <machine/stdarg.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
 #include <sys/syslog.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 
-#include <machine/pc/bios.h>
-#include <machine/vm86.h>
-#ifdef PC98
+#include <machine/apm_bios.h>
 #include <machine/bus.h>
+#include <machine/clock.h>
+#include <machine/pc/bios.h>
+#include <machine/cpufunc.h>
 #include <machine/resource.h>
+#include <machine/segments.h>
+#include <machine/stdarg.h>
+#include <machine/vm86.h>
+
 #include <sys/rman.h>
-#endif
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_param.h>
 
 #include <pc98/apm/apm.h>
 
@@ -706,7 +707,7 @@ apm_cpu_idle(void)
 	 * APM driver.
 	 */
 	if (!sc->active || sc->always_halt_cpu)
-		__asm("hlt");	/* wait for interrupt */
+		halt();	/* wait for interrupt */
 }
 
 /* inform APM BIOS that CPU is busy */
@@ -1493,7 +1494,7 @@ static driver_t apm_driver = {
 
 static devclass_t apm_devclass;
 
-DRIVER_MODULE(apm, nexus, apm_driver, apm_devclass, apm_modevent, 0);
+DRIVER_MODULE(apm, legacy, apm_driver, apm_devclass, apm_modevent, 0);
 MODULE_VERSION(apm, 1);
 
 static int