[src/trunk]: src/sys/arch/arm/arm32 nG bit exists only in ARMv6 and above.

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

details:   https://anonhg.NetBSD.org/src/rev/74b62c9f1887
branches:  trunk
changeset: 332472:74b62c9f1887
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue Sep 23 05:45:01 2014 +0000

description:
nG bit exists only in ARMv6 and above.

diffstat:

 sys/arch/arm/arm32/pmap.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 94337fef1ffd -r 74b62c9f1887 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Mon Sep 22 21:35:15 2014 +0000
+++ b/sys/arch/arm/arm32/pmap.c Tue Sep 23 05:45:01 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.300 2014/09/21 15:45:46 christos Exp $      */
+/*     $NetBSD: pmap.c,v 1.301 2014/09/23 05:45:01 nonaka Exp $        */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
 #include <arm/locore.h>
 //#include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.300 2014/09/21 15:45:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.301 2014/09/23 05:45:01 nonaka Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -2405,7 +2405,11 @@
                const pt_entry_t opte = *ptep;
                pt_entry_t npte = opte | execbits;
 
-               KASSERT((opte & L2_XS_nG) == (pm == pmap_kernel() ? 0 : L2_XS_nG));
+#if defined(DIAGNOSTIC) && (defined(CPU_ARMV6) || defined(CPU_ARMV7))
+               if (CPU_IS_ARMV6_P() || CPU_IS_ARMV7_P()) {
+                       KASSERT((opte & L2_XS_nG) == (pm == pmap_kernel() ? 0 : L2_XS_nG));
+               }
+#endif
 
                NPDEBUG(PDB_BITS,
                    printf( "%s: pv %p, pm %p, va 0x%08lx, flag 0x%x\n",