diff options
| author | kato <kato@FreeBSD.org> | 2001-05-02 13:48:39 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2001-05-02 13:48:39 +0000 |
| commit | 7829b9a6fd0d37e2e8d1d3e0583bb9a38475f796 (patch) | |
| tree | ab4c9e820bfb9537d7eefcd1a7f1b5085b134f2a /sys/pc98 | |
| parent | a27ff43b9af008ffc0eae8468583f22b060558d8 (diff) | |
| download | FreeBSD-src-7829b9a6fd0d37e2e8d1d3e0583bb9a38475f796.zip FreeBSD-src-7829b9a6fd0d37e2e8d1d3e0583bb9a38475f796.tar.gz | |
Merged the rest of changes in sys/i386/i386/machdep.c revision 1.447.
Diffstat (limited to 'sys/pc98')
| -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 e4395d7..39631c0 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 e4395d7..39631c0 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 /* |
