From 281238b184f094043d3d8cc70bd531929374f53b Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Wed, 2 May 2001 13:48:39 +0000
Subject: [PATCH] Merged the rest of changes in sys/i386/i386/machdep.c
 revision 1.447.

---
 sys/pc98/i386/machdep.c | 11 +++++------
 sys/pc98/pc98/machdep.c | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index e4395d791b9..39631c00d57 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -66,6 +66,7 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
+#include <sys/smp.h>
 #include <sys/callout.h>
 #include <sys/msgbuf.h>
 #include <sys/sysent.h>
@@ -104,9 +105,6 @@
 #include <machine/globaldata.h>
 #include <machine/globals.h>
 #include <machine/intrcnt.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -454,9 +452,10 @@ cpu_startup(dummy)
 
 #ifdef SMP
 	globaldata_register(GLOBALDATA);
-#endif
-
+#else
+	/* For SMP, we delay the cpu_setregs() until after SMP startup. */
 	cpu_setregs();
+#endif
 }
 
 /*
@@ -1924,7 +1923,7 @@ getmemsize(int first)
 	physmap[1] = mp_bootaddress(physmap[1] / 1024);
 
 	/* look for the MP hardware - needed for apic addresses */
-	mp_probe();
+	i386_mp_probe();
 #endif
 
 	/*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index e4395d791b9..39631c00d57 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -66,6 +66,7 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
+#include <sys/smp.h>
 #include <sys/callout.h>
 #include <sys/msgbuf.h>
 #include <sys/sysent.h>
@@ -104,9 +105,6 @@
 #include <machine/globaldata.h>
 #include <machine/globals.h>
 #include <machine/intrcnt.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
@@ -454,9 +452,10 @@ cpu_startup(dummy)
 
 #ifdef SMP
 	globaldata_register(GLOBALDATA);
-#endif
-
+#else
+	/* For SMP, we delay the cpu_setregs() until after SMP startup. */
 	cpu_setregs();
+#endif
 }
 
 /*
@@ -1924,7 +1923,7 @@ getmemsize(int first)
 	physmap[1] = mp_bootaddress(physmap[1] / 1024);
 
 	/* look for the MP hardware - needed for apic addresses */
-	mp_probe();
+	i386_mp_probe();
 #endif
 
 	/*