diff options
Diffstat (limited to 'sys/arch/amd64/amd64/pmap.c')
| -rw-r--r-- | sys/arch/amd64/amd64/pmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index 85598eed545..bb7ba397bbe 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.107 2018/01/07 05:35:10 mlarkin Exp $ */ +/* $OpenBSD: pmap.c,v 1.108 2018/01/07 19:56:19 mlarkin Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -513,7 +513,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot) /* special 1:1 mappings in the first 2MB must not be global */ if (va >= (vaddr_t)NBPD_L2) - npte |= PG_G; + npte |= pg_g_kern; if (!(prot & PROT_EXEC)) npte |= pg_nx; @@ -655,7 +655,7 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa) kva += PAGE_SIZE) { p1i = pl1_i(kva); if (pmap_valid_entry(PTE_BASE[p1i])) - PTE_BASE[p1i] |= PG_G; + PTE_BASE[p1i] |= pg_g_kern; } /* @@ -680,7 +680,7 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa) va = PMAP_DIRECT_MAP(pdp); *((pd_entry_t *)va) = ((paddr_t)i << L2_SHIFT); - *((pd_entry_t *)va) |= PG_RW | PG_V | PG_PS | PG_G | PG_U | + *((pd_entry_t *)va) |= PG_RW | PG_V | PG_PS | pg_g_kern | PG_U | PG_M | pg_nx; } @@ -2155,7 +2155,7 @@ enter_now: else if (va < VM_MAX_ADDRESS) npte |= (PG_u | PG_RW); /* XXXCDC: no longer needed? */ if (pmap == pmap_kernel()) - npte |= PG_G; + npte |= pg_g_kern; ptes[pl1_i(va)] = npte; /* zap! */ |