mirror of
https://github.com/opnsense/src.git
synced 2026-06-11 09:41:03 -04:00
Merged from sys/i386/i386/machdep.c revision 1.426.
This commit is contained in:
parent
005b575313
commit
e93f5a3faa
2 changed files with 20 additions and 6 deletions
|
|
@ -258,6 +258,9 @@ static vm_offset_t buffer_sva, buffer_eva;
|
|||
vm_offset_t clean_sva, clean_eva;
|
||||
static vm_offset_t pager_sva, pager_eva;
|
||||
static struct trapframe proc0_tf;
|
||||
#ifndef SMP
|
||||
static struct globaldata __globaldata;
|
||||
#endif
|
||||
|
||||
struct cpuhead cpuhead;
|
||||
|
||||
|
|
@ -2160,10 +2163,14 @@ init386(first)
|
|||
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];
|
||||
SMP_prvspace[0].globaldata.gd_prvspace = &SMP_prvspace[0].globaldata;
|
||||
#else
|
||||
gdt_segs[GPRIV_SEL].ssd_limit = i386_btop(0) - 1;
|
||||
gdt_segs[GPROC0_SEL].ssd_base = (int) &common_tss;
|
||||
gdt_segs[GPRIV_SEL].ssd_limit =
|
||||
i386_btop(sizeof(struct globaldata)) - 1;
|
||||
gdt_segs[GPRIV_SEL].ssd_base = (int) &__globaldata;
|
||||
gdt_segs[GPROC0_SEL].ssd_base =
|
||||
(int) &__globaldata.gd_common_tss;
|
||||
__globaldata.gd_prvspace = &__globaldata;
|
||||
#endif
|
||||
|
||||
for (x = 0; x < NGDT; x++) {
|
||||
|
|
|
|||
|
|
@ -258,6 +258,9 @@ static vm_offset_t buffer_sva, buffer_eva;
|
|||
vm_offset_t clean_sva, clean_eva;
|
||||
static vm_offset_t pager_sva, pager_eva;
|
||||
static struct trapframe proc0_tf;
|
||||
#ifndef SMP
|
||||
static struct globaldata __globaldata;
|
||||
#endif
|
||||
|
||||
struct cpuhead cpuhead;
|
||||
|
||||
|
|
@ -2160,10 +2163,14 @@ init386(first)
|
|||
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];
|
||||
SMP_prvspace[0].globaldata.gd_prvspace = &SMP_prvspace[0].globaldata;
|
||||
#else
|
||||
gdt_segs[GPRIV_SEL].ssd_limit = i386_btop(0) - 1;
|
||||
gdt_segs[GPROC0_SEL].ssd_base = (int) &common_tss;
|
||||
gdt_segs[GPRIV_SEL].ssd_limit =
|
||||
i386_btop(sizeof(struct globaldata)) - 1;
|
||||
gdt_segs[GPRIV_SEL].ssd_base = (int) &__globaldata;
|
||||
gdt_segs[GPROC0_SEL].ssd_base =
|
||||
(int) &__globaldata.gd_common_tss;
|
||||
__globaldata.gd_prvspace = &__globaldata;
|
||||
#endif
|
||||
|
||||
for (x = 0; x < NGDT; x++) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue