diff options
| author | jhb <jhb@FreeBSD.org> | 2001-05-10 17:45:49 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-05-10 17:45:49 +0000 |
| commit | 41fc4419f3762bcb77454d08efb22c049b2259bb (patch) | |
| tree | 303330e5c0ad9c65ed39b222d1233727e2818286 /sys/pc98 | |
| parent | 666424d146293fddcb56001344a6f8e225cc13de (diff) | |
| download | FreeBSD-src-41fc4419f3762bcb77454d08efb22c049b2259bb.zip FreeBSD-src-41fc4419f3762bcb77454d08efb22c049b2259bb.tar.gz | |
- Split out the support for per-CPU data from the SMP code. UP kernels
have per-CPU data and gdb on the i386 at least needs access to it.
- Clean up includes in kern_idle.c and subr_smp.c.
Reviewed by: jake
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 5 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 4564007..ff8ac2c 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -450,9 +450,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 4564007..ff8ac2c 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -450,9 +450,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif |
