From b41835dfe7f293edf3462f8fd15f034dced41277 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 22 Aug 2018 14:58:52 +0000 Subject: [PATCH] Skip PMAP_PCID_KERN + 1 PCPU pcid_next value on APs as well. r337838 did it for BSP. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/amd64/amd64/mp_machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 72c8249aeef1..4ca2e07e578c 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -298,8 +298,9 @@ init_secondary(void) pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL]; pc->pc_ldt = (struct system_segment_descriptor *)&gdt[NGDT * cpu + GUSERLDT_SEL]; + /* See comment in pmap_bootstrap(). */ + pc->pc_pcid_next = PMAP_PCID_KERN + 2; pc->pc_pcid_gen = 1; - pc->pc_pcid_next = PMAP_PCID_KERN + 1; common_tss[cpu].tss_rsp0 = 0; /* Save the per-cpu pointer for use by the NMI handler. */