[src/trunk]: src/sys/arch/x86/x86 Mmh, restore PG_G on the direct map, we sti...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/685938229daa
branches:  trunk
changeset: 358859:685938229daa
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Jan 20 08:45:28 2018 +0000

description:
Mmh, restore PG_G on the direct map, we still want that in the non-SVS
case.

diffstat:

 sys/arch/x86/x86/pmap.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 152d8b701e52 -r 685938229daa sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sat Jan 20 08:30:53 2018 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sat Jan 20 08:45:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.278 2018/01/07 16:10:16 maxv Exp $  */
+/*     $NetBSD: pmap.c,v 1.279 2018/01/20 08:45:28 maxv Exp $  */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.278 2018/01/07 16:10:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.279 2018/01/20 08:45:28 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1635,9 +1635,11 @@
                pa = (paddr_t)(i * NBPD_L2);
 
                if (spahole <= pa && pa < epahole) {
-                       L2_BASE[L2e_idx+i] = pa | holepteflags | PG_U | PG_PS;
+                       L2_BASE[L2e_idx+i] = pa | holepteflags | PG_U |
+                           PG_PS | pmap_pg_g;
                } else {
-                       L2_BASE[L2e_idx+i] = pa | pteflags | PG_U | PG_PS;
+                       L2_BASE[L2e_idx+i] = pa | pteflags | PG_U |
+                           PG_PS | pmap_pg_g;
                }
        }