diff options
Diffstat (limited to 'usr/src/uts/i86pc/os/mp_startup.c')
| -rw-r--r-- | usr/src/uts/i86pc/os/mp_startup.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c index 3c42c2d42f..e90dc6466a 100644 --- a/usr/src/uts/i86pc/os/mp_startup.c +++ b/usr/src/uts/i86pc/os/mp_startup.c @@ -267,13 +267,8 @@ static void init_cpu_id_gdt(struct cpu *cp) { /* Write cpu_id into limit field of GDT for usermode retrieval */ -#if defined(__amd64) set_usegd(&cp->cpu_gdt[GDT_CPUID], SDP_SHORT, NULL, cp->cpu_id, SDT_MEMRODA, SEL_UPL, SDP_BYTES, SDP_OP32); -#elif defined(__i386) - set_usegd(&cp->cpu_gdt[GDT_CPUID], NULL, cp->cpu_id, SDT_MEMRODA, - SEL_UPL, SDP_BYTES, SDP_OP32); -#endif } #endif /* !defined(__xpv) */ @@ -352,9 +347,7 @@ mp_cpu_configure_common(int cpun, boolean_t boot) */ sp = tp->t_stk; tp->t_sp = (uintptr_t)(sp - MINFRAME); -#if defined(__amd64) tp->t_sp -= STACK_ENTRY_ALIGN; /* fake a call */ -#endif /* * Setup thread start entry point for boot or hotplug. */ @@ -421,13 +414,6 @@ mp_cpu_configure_common(int cpun, boolean_t boot) cp->cpu_gdt = kmem_zalloc(PAGESIZE, KM_SLEEP); bcopy(CPU->cpu_gdt, cp->cpu_gdt, (sizeof (*cp->cpu_gdt) * NGDT)); -#if defined(__i386) - /* - * setup kernel %gs. - */ - set_usegd(&cp->cpu_gdt[GDT_GS], cp, sizeof (struct cpu) -1, SDT_MEMRWA, - SEL_KPL, 0, 1); -#endif /* * Allocate pages for the CPU LDT. @@ -817,7 +803,7 @@ do_erratum_298(struct cpu *cpu) uint_t workaround_errata(struct cpu *cpu) { - uint_t missing = 0; + volatile uint_t missing = 0; ASSERT(cpu == CPU); @@ -1632,7 +1618,7 @@ done: boot_max_ncpus, ncpus); cmn_err(CE_NOTE, "Use \"boot-ncpus\" parameter to enable more CPU(s). " - "See eeprom(1M)."); + "See eeprom(8)."); } } |