From 1f0a270770fd8a4236d060a47e4a093372631291 Mon Sep 17 00:00:00 2001 From: nyan Date: Wed, 14 Nov 2007 12:29:09 +0000 Subject: MFi386: revision 1.661 Drastically simplify the i386 pcpu backend by merging parts of the amd64 mechanism over. --- sys/pc98/pc98/machdep.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sys/pc98') 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 #endif #ifdef SMP -#include #include #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; -- cgit v1.1