diff options
| author | KATO Takenori <kato@FreeBSD.org> | 2001-05-02 13:48:39 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 2001-05-02 13:48:39 +0000 |
| commit | 281238b184f094043d3d8cc70bd531929374f53b (patch) | |
| tree | 2e4425493bd1b97f38cc00a2e2f49f2d63589769 /sys | |
| parent | 127826924a941df0a077355ff2b32a6d809e9c01 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 11 | ||||
| -rw-r--r-- | 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 e4395d791b97..39631c00d573 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 @@ again: #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 @@ physmap_done: 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 e4395d791b97..39631c00d573 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 @@ again: #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 @@ physmap_done: physmap[1] = mp_bootaddress(physmap[1] / 1024); /* look for the MP hardware - needed for apic addresses */ - mp_probe(); + i386_mp_probe(); #endif /* |