From c70606fd9f9fee4edc3914a3413b68eddcfdcf9f Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Fri, 6 Nov 1998 08:07:32 +0000
Subject: [PATCH] Sync with sys/i386/i386/machdep.c revision up to 1.315.

---
 sys/pc98/i386/machdep.c | 25 ++-----------------------
 sys/pc98/pc98/machdep.c | 25 ++-----------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 7449379560cf..0e0c73355c39 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $
+ *	$Id: machdep.c,v 1.99 1998/10/11 15:04:38 kato Exp $
  */
 
 #include "apm.h"
@@ -109,9 +109,6 @@
 #include <net/netisr.h>
 #endif
 
-#if NAPM > 0
-#include <machine/apm_bios.h>
-#endif
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/clock.h>
@@ -449,14 +446,7 @@ cpu_startup(dummy)
 	}
 
 #if defined(USERCONFIG)
-#if defined(USERCONFIG_BOOT)
-	if (1) {
-#else
-        if (boothowto & RB_CONFIG) {
-#endif
-		userconfig();
-		cninit();	/* the preferred console may have changed */
-	}
+	userconfig();
 #endif
 
 	printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count),
@@ -806,17 +796,6 @@ cpu_halt(void)
 		__asm__ ("hlt");
 }
 
-/*
- * Turn the power off.
- */
-void
-cpu_power_down(void)
-{
-#if NAPM > 0
-	apm_power_off();
-#endif
-}
-
 /*
  * Clear registers on exec
  */
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 7449379560cf..0e0c73355c39 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.98 1998/10/09 12:36:25 kato Exp $
+ *	$Id: machdep.c,v 1.99 1998/10/11 15:04:38 kato Exp $
  */
 
 #include "apm.h"
@@ -109,9 +109,6 @@
 #include <net/netisr.h>
 #endif
 
-#if NAPM > 0
-#include <machine/apm_bios.h>
-#endif
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/clock.h>
@@ -449,14 +446,7 @@ cpu_startup(dummy)
 	}
 
 #if defined(USERCONFIG)
-#if defined(USERCONFIG_BOOT)
-	if (1) {
-#else
-        if (boothowto & RB_CONFIG) {
-#endif
-		userconfig();
-		cninit();	/* the preferred console may have changed */
-	}
+	userconfig();
 #endif
 
 	printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count),
@@ -806,17 +796,6 @@ cpu_halt(void)
 		__asm__ ("hlt");
 }
 
-/*
- * Turn the power off.
- */
-void
-cpu_power_down(void)
-{
-#if NAPM > 0
-	apm_power_off();
-#endif
-}
-
 /*
  * Clear registers on exec
  */