Module Name: src Committed By: maxv Date: Sun Mar 5 08:36:35 UTC 2017
Modified Files: src/sys/arch/x86/x86: pmap.c Log Message: Should be PG_k, doesn't change anything. To generate a diff of this commit: cvs rdiff -u -r1.240 -r1.241 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.240 src/sys/arch/x86/x86/pmap.c:1.241 --- src/sys/arch/x86/x86/pmap.c:1.240 Sat Feb 11 14:11:24 2017 +++ src/sys/arch/x86/x86/pmap.c Sun Mar 5 08:36:35 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.240 2017/02/11 14:11:24 maxv Exp $ */ +/* $NetBSD: pmap.c,v 1.241 2017/03/05 08:36:35 maxv Exp $ */ /*- * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -171,7 +171,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.240 2017/02/11 14:11:24 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.241 2017/03/05 08:36:35 maxv Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -1354,7 +1354,7 @@ pmap_bootstrap(vaddr_t kva_start) memset((void *)(xen_dummy_user_pgd + KERNBASE), 0, PAGE_SIZE); /* Mark read-only */ HYPERVISOR_update_va_mapping(xen_dummy_user_pgd + KERNBASE, - pmap_pa2pte(xen_dummy_user_pgd) | PG_u | PG_V | pmap_pg_nx, + pmap_pa2pte(xen_dummy_user_pgd) | PG_k | PG_V | pmap_pg_nx, UVMF_INVLPG); /* Pin as L4 */ xpq_queue_pin_l4_table(xpmap_ptom_masked(xen_dummy_user_pgd)); @@ -2092,7 +2092,7 @@ pmap_pdp_ctor(void *arg, void *v, int fl * This pdir will NEVER be active in kernel mode, so mark * recursive entry invalid. */ - pdir[PDIR_SLOT_PTE] = pmap_pa2pte(pdirpa) | PG_u; + pdir[PDIR_SLOT_PTE] = pmap_pa2pte(pdirpa) | PG_k; /* * PDP constructed this way won't be for the kernel, hence we