[src/trunk]: src/sys/arch/x86/x86 The NOX bit on large pages does not need to...

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

details:   https://anonhg.NetBSD.org/src/rev/59a3e422d03b
branches:  trunk
changeset: 345242:59a3e422d03b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat May 14 09:37:21 2016 +0000

description:
The NOX bit on large pages does not need to be amd64-specific anymore.
The i386 secondary CPUs can now properly handle it.

diffstat:

 sys/arch/x86/x86/pmap.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (43 lines):

diff -r be9c57b5499a -r 59a3e422d03b sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sat May 14 08:52:20 2016 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sat May 14 09:37:21 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.193 2016/05/13 11:47:02 maxv Exp $  */
+/*     $NetBSD: pmap.c,v 1.194 2016/05/14 09:37:21 maxv Exp $  */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.193 2016/05/13 11:47:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.194 2016/05/14 09:37:21 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1343,12 +1343,7 @@
                for (/* */; kva + NBPD_L2 <= kva_end; kva += NBPD_L2,
                    pa += NBPD_L2) {
                        pde = &L2_BASE[pl2_i(kva)];
-#ifdef __x86_64__
                        *pde = pa | pmap_pg_g | PG_PS | pg_nx | PG_KR | PG_V;
-#else
-                       *pde = pa | pmap_pg_g | PG_PS | PG_KR | PG_V;
-#endif
-
                        tlbflushg();
                }
 
@@ -1359,11 +1354,7 @@
                for (/* */; kva + NBPD_L2 <= kva_end; kva += NBPD_L2,
                    pa += NBPD_L2) {
                        pde = &L2_BASE[pl2_i(kva)];
-#ifdef __x86_64__
                        *pde = pa | pmap_pg_g | PG_PS | pg_nx | PG_KW | PG_V;
-#else
-                       *pde = pa | pmap_pg_g | PG_PS | PG_KW | PG_V;
-#endif
                        tlbflushg();
                }
        }