From 6f468ee3e31fb4539d2c806ae001f83a757a599c Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Wed, 27 Aug 1997 08:43:21 +0000
Subject: [PATCH] Synchronize with sys/i386/i386/machdep.c and trap.c revision
 1.258 and 1.108, respectively.

---
 sys/pc98/i386/machdep.c | 14 +++++++-------
 sys/pc98/i386/trap.c    |  7 ++++++-
 sys/pc98/pc98/machdep.c | 14 +++++++-------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 36981aa86e4..d6e4a972ca7 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.51 1997/08/18 11:29:57 kato Exp $
+ *	$Id: machdep.c,v 1.52 1997/08/21 10:12:42 kato Exp $
  */
 
 #include "apm.h"
@@ -403,6 +403,12 @@ cpu_startup(dummy)
 	printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count),
 	    ptoa(cnt.v_free_count) / 1024);
 
+	/*
+	 * Set up buffers, so they can be used to read disk labels.
+	 */
+	bufinit();
+	vm_pager_bufferinit();
+
 #ifdef SMP
 	/*
 	 * OK, enough kmem_alloc/malloc state should be up, lets get on with it!
@@ -410,12 +416,6 @@ cpu_startup(dummy)
 	mp_start();			/* fire up the APs and APICs */
 	mp_announce();
 #endif  /* SMP */
-
-	/*
-	 * Set up buffers, so they can be used to read disk labels.
-	 */
-	bufinit();
-	vm_pager_bufferinit();
 }
 
 int
diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c
index 1206b760f8b..17a24fe3fc8 100644
--- a/sys/pc98/i386/trap.c
+++ b/sys/pc98/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.31 1997/08/20 10:24:56 kato Exp $
+ *	$Id: trap.c,v 1.32 1997/08/21 10:12:48 kato Exp $
  */
 
 /*
@@ -775,6 +775,7 @@ trap_fatal(frame)
 			ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel");
 #ifdef SMP
 	printf("cpuid = %d\n", cpuid);
+	printf("lapic.id = %d\n", lapic.id);
 #endif
 	if (type == T_PAGEFLT) {
 		printf("fault virtual address	= 0x%x\n", eva);
@@ -819,6 +820,9 @@ trap_fatal(frame)
 	} else {
 		printf("Idle\n");
 	}
+#ifdef SMP
+	printf("mp_lock                 = %08x\n", mp_lock);
+#endif
 	printf("interrupt mask		= ");
 	if ((cpl & net_imask) == net_imask)
 		printf("net ");
@@ -874,6 +878,7 @@ dblfault_handler()
 	printf("ebp = 0x%x\n", common_tss.tss_ebp);
 #ifdef SMP
 	printf("cpuid = %d\n", cpuid);
+	printf("lapic.id = %d\n", lapic.id);
 #endif
 	panic("double fault");
 }
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 36981aa86e4..d6e4a972ca7 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.51 1997/08/18 11:29:57 kato Exp $
+ *	$Id: machdep.c,v 1.52 1997/08/21 10:12:42 kato Exp $
  */
 
 #include "apm.h"
@@ -403,6 +403,12 @@ cpu_startup(dummy)
 	printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count),
 	    ptoa(cnt.v_free_count) / 1024);
 
+	/*
+	 * Set up buffers, so they can be used to read disk labels.
+	 */
+	bufinit();
+	vm_pager_bufferinit();
+
 #ifdef SMP
 	/*
 	 * OK, enough kmem_alloc/malloc state should be up, lets get on with it!
@@ -410,12 +416,6 @@ cpu_startup(dummy)
 	mp_start();			/* fire up the APs and APICs */
 	mp_announce();
 #endif  /* SMP */
-
-	/*
-	 * Set up buffers, so they can be used to read disk labels.
-	 */
-	bufinit();
-	vm_pager_bufferinit();
 }
 
 int
-- 
2.45.2