Module Name: src
Committed By: jmcneill
Date: Sat Feb 7 00:08:34 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: arm32_tlb.c
Log Message:
fix CPU_CORTEXA5 && !MULTIPROCESSOR build
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm32/arm32_tlb.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/arm/arm32/arm32_tlb.c
diff -u src/sys/arch/arm/arm32/arm32_tlb.c:1.7 src/sys/arch/arm/arm32/arm32_tlb.c:1.8
--- src/sys/arch/arm/arm32/arm32_tlb.c:1.7 Thu Oct 30 10:45:17 2014
+++ src/sys/arch/arm/arm32/arm32_tlb.c Sat Feb 7 00:08:34 2015
@@ -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 @@ tlb_cortex_a5_record_asids(u_long *mapp)
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)
