diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2001-12-11 23:33:44 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2001-12-11 23:33:44 +0000 |
| commit | 0bbc882680ceece07eb134ddeb7fceffb59ea018 (patch) | |
| tree | c785835e70070309148a72c55669ff0bf043a20a /sys/pc98 | |
| parent | defd4957ccd0abfd2d3d3417dfae025ee37f770e (diff) | |
Notes
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 17 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 6c05881c07f4..f1775add4085 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -104,7 +104,6 @@ #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ #include <machine/proc.h> -#include <machine/globals.h> #ifdef PERFMON #include <machine/perfmon.h> #endif @@ -220,7 +219,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; #ifndef SMP -static struct globaldata __globaldata; +static struct pcpu __pcpu; #endif struct mtx sched_lock; @@ -275,7 +274,7 @@ cpu_startup(dummy) bufinit(); vm_pager_bufferinit(); - globaldata_register(GLOBALDATA); + pcpu_init(GLOBALDATA, 0, sizeof(struct pcpu)); #ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); @@ -1774,15 +1773,15 @@ init386(first) atop(sizeof(struct privatespace) - 1); gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[0]; gdt_segs[GPROC0_SEL].ssd_base = - (int) &SMP_prvspace[0].globaldata.gd_common_tss; - SMP_prvspace[0].globaldata.gd_prvspace = &SMP_prvspace[0].globaldata; + (int) &SMP_prvspace[0].pcpu.pc_common_tss; + SMP_prvspace[0].pcpu.pc_prvspace = &SMP_prvspace[0].pcpu; #else gdt_segs[GPRIV_SEL].ssd_limit = - atop(sizeof(struct globaldata) - 1); - gdt_segs[GPRIV_SEL].ssd_base = (int) &__globaldata; + atop(sizeof(struct pcpu) - 1); + gdt_segs[GPRIV_SEL].ssd_base = (int) &__pcpu; gdt_segs[GPROC0_SEL].ssd_base = - (int) &__globaldata.gd_common_tss; - __globaldata.gd_prvspace = &__globaldata; + (int) &__pcpu.pc_common_tss; + __pcpu.pc_prvspace = &__pcpu; #endif for (x = 0; x < NGDT; x++) { diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 6c05881c07f4..f1775add4085 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -104,7 +104,6 @@ #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ #include <machine/proc.h> -#include <machine/globals.h> #ifdef PERFMON #include <machine/perfmon.h> #endif @@ -220,7 +219,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; #ifndef SMP -static struct globaldata __globaldata; +static struct pcpu __pcpu; #endif struct mtx sched_lock; @@ -275,7 +274,7 @@ cpu_startup(dummy) bufinit(); vm_pager_bufferinit(); - globaldata_register(GLOBALDATA); + pcpu_init(GLOBALDATA, 0, sizeof(struct pcpu)); #ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); @@ -1774,15 +1773,15 @@ init386(first) atop(sizeof(struct privatespace) - 1); gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[0]; gdt_segs[GPROC0_SEL].ssd_base = - (int) &SMP_prvspace[0].globaldata.gd_common_tss; - SMP_prvspace[0].globaldata.gd_prvspace = &SMP_prvspace[0].globaldata; + (int) &SMP_prvspace[0].pcpu.pc_common_tss; + SMP_prvspace[0].pcpu.pc_prvspace = &SMP_prvspace[0].pcpu; #else gdt_segs[GPRIV_SEL].ssd_limit = - atop(sizeof(struct globaldata) - 1); - gdt_segs[GPRIV_SEL].ssd_base = (int) &__globaldata; + atop(sizeof(struct pcpu) - 1); + gdt_segs[GPRIV_SEL].ssd_base = (int) &__pcpu; gdt_segs[GPROC0_SEL].ssd_base = - (int) &__globaldata.gd_common_tss; - __globaldata.gd_prvspace = &__globaldata; + (int) &__pcpu.pc_common_tss; + __pcpu.pc_prvspace = &__pcpu; #endif for (x = 0; x < NGDT; x++) { |