[src/trunk]: src/sys/arch/arm/arm32 fix CPU_CORTEXA5 && !MULTIPROCESSOR build

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

details:   https://anonhg.NetBSD.org/src/rev/ffb8f5fd6ce5
branches:  trunk
changeset: 336014:ffb8f5fd6ce5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 07 00:08:34 2015 +0000

description:
fix CPU_CORTEXA5 && !MULTIPROCESSOR build

diffstat:

 sys/arch/arm/arm32/arm32_tlb.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 7b44afc876b3 -r ffb8f5fd6ce5 sys/arch/arm/arm32/arm32_tlb.c
--- a/sys/arch/arm/arm32/arm32_tlb.c    Sat Feb 07 00:02:09 2015 +0000
+++ b/sys/arch/arm/arm32/arm32_tlb.c    Sat Feb 07 00:08:34 2015 +0000
@@ -30,7 +30,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_tlb.c,v 1.7 2014/10/30 10:45:17 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_tlb.c,v 1.8 2015/02/07 00:08:34 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -147,11 +147,11 @@
                        const uint64_t d = ((uint64_t) armreg_tlbdata1_read())
                            | armreg_tlbdata0_read();
                        if (!(d & ARM_TLBDATA_VALID)
-                           || !(d & ARM_V5_TLBDATA_nG))
+                           || !(d & ARM_A5_TLBDATA_nG))
                                continue;
 
                        const tlb_asid_t asid = __SHIFTOUT(d,
-                           ARM_V5_TLBDATA_ASID);
+                           ARM_A5_TLBDATA_ASID);
                        const u_long mask = 1L << (asid & 31);
                        const size_t idx = asid >> 5;
                        if (mapp[idx] & mask)