diff options
| author | nyan <nyan@FreeBSD.org> | 2007-11-14 12:29:09 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2007-11-14 12:29:09 +0000 |
| commit | 1f0a270770fd8a4236d060a47e4a093372631291 (patch) | |
| tree | dfee3cc14861501b69d51783b7def95ea76f251a /sys/pc98 | |
| parent | 6cd20c281d1cc43413205876ff4d8bcc02027d78 (diff) | |
| download | FreeBSD-src-1f0a270770fd8a4236d060a47e4a093372631291.zip FreeBSD-src-1f0a270770fd8a4236d060a47e4a093372631291.tar.gz | |
MFi386: revision 1.661
Drastically simplify the i386 pcpu backend by merging parts of the
amd64 mechanism over.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 3ec69be..1472af0 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -125,7 +125,6 @@ __FBSDID("$FreeBSD$"); #include <machine/perfmon.h> #endif #ifdef SMP -#include <machine/privatespace.h> #include <machine/smp.h> #endif @@ -204,9 +203,7 @@ vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; struct kva_md_info kmi; static struct trapframe proc0_tf; -#ifndef SMP -static struct pcpu __pcpu; -#endif +struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; @@ -1950,11 +1947,7 @@ init386(first) gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1); gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1); -#ifdef SMP - pc = &SMP_prvspace[0].pcpu; -#else - pc = &__pcpu; -#endif + pc = &__pcpu[0]; gdt_segs[GPRIV_SEL].ssd_limit = atop(0 - 1); gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; |
