summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2008-08-02 10:31:48 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2008-08-02 10:31:48 +0000
commitd3d987a499de6e804067daf01e73847ffb873014 (patch)
treed433127d3c2f86964e1c0cdbc17cb20b48c66aab
parentb2c702eb776e1a78a637087d082b20622a65e279 (diff)
Notes
-rw-r--r--sys/pc98/pc98/machdep.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 0626f11144b7..5b248a2795f9 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;
@@ -1969,11 +1966,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;