diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-05-28 20:52:45 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-05-28 20:52:45 +0000 |
| commit | e47d384a0225e10371134e5c6b219992779a9132 (patch) | |
| tree | c0d4860664b25e118588c69c53154e2358402b01 /sys/arch/i386/include/pmap.h | |
| parent | 4dc4c6c9550b372fbb3977112c09486d42cacf09 (diff) | |
More steps for i386 Meltdown fix:
- name gdt explicitly in struct cpu_info_full
- identfiy ARCH_CAPABILITIES_RDCL_NO and print in identifycpu()
- in pmap.c build U-K table, handle PG_G accordingly
- in pmap_switch() do not unmap the kernel, yet; but all pieces
are in place
- pmapae.c: on boostrap transfer pmap to pmapae tables, build
U-K table and wire it, handle PG_G
from hshoexer@; OK mlarkin@
Diffstat (limited to 'sys/arch/i386/include/pmap.h')
| -rw-r--r-- | sys/arch/i386/include/pmap.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h index d8992fd9763..91df8dfc14d 100644 --- a/sys/arch/i386/include/pmap.h +++ b/sys/arch/i386/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.84 2018/04/11 15:44:08 bluhm Exp $ */ +/* $OpenBSD: pmap.h,v 1.85 2018/05/28 20:52:44 bluhm Exp $ */ /* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */ /* @@ -95,6 +95,7 @@ LIST_HEAD(pmap_head, pmap); /* struct pmap_head: head of a pmap list */ struct pmap { uint64_t pm_pdidx[4]; /* PDIEs for PAE mode */ + uint64_t pm_pdidx_intel[4]; /* PDIEs for PAE mode U-K */ struct mutex pm_mtx; struct mutex pm_apte_mtx; @@ -226,7 +227,9 @@ extern struct pool pmap_pv_pool; * Prototypes */ +vaddr_t pmap_tmpmap_pa_86(paddr_t); vaddr_t pmap_tmpmap_pa(paddr_t); +void pmap_tmpunmap_pa_86(void); void pmap_tmpunmap_pa(void); void pmap_bootstrap(vaddr_t); |