summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2014-10-07 10:10:58 +0000
committerjsg <jsg@openbsd.org>2014-10-07 10:10:58 +0000
commit4c0e588a106e1a930141ba111fd6a38bb9f7fe8f (patch)
tree213d6001950bc425a2592a23a799947e9777c2b5
parentSince the list of mpe(4) interfaces is only accessed in process context, (diff)
downloadwireguard-openbsd-4c0e588a106e1a930141ba111fd6a38bb9f7fe8f.tar.xz
wireguard-openbsd-4c0e588a106e1a930141ba111fd6a38bb9f7fe8f.zip
Use L1_S_V7_AP instead of L1_S_AP for the v7 case
otherwise the high bit of AP will end up in TEX.
-rw-r--r--sys/arch/arm/include/pmap.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index c6bf3320e79..af4280bb6bd 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.26 2014/10/07 07:14:55 jsg Exp $ */
+/* $OpenBSD: pmap.h,v 1.27 2014/10/07 10:10:58 jsg Exp $ */
/* $NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $ */
/*
@@ -488,11 +488,11 @@ extern void (*pmap_zero_page_func)(struct vm_page *);
#define L1_S_PROT_KW_xscale (L1_S_AP(AP_W))
#define L1_S_PROT_MASK_xscale (L1_S_AP(0x03))
-#define L1_S_PROT_UR_v7 (L1_S_AP(AP_KRWUR))
-#define L1_S_PROT_UW_v7 (L1_S_AP(AP_KRWURW))
-#define L1_S_PROT_KR_v7 (L1_S_AP(AP_V7_KR))
-#define L1_S_PROT_KW_v7 (L1_S_AP(AP_KRW))
-#define L1_S_PROT_MASK_v7 (L1_S_AP(0x07))
+#define L1_S_PROT_UR_v7 (L1_S_V7_AP(AP_KRWUR))
+#define L1_S_PROT_UW_v7 (L1_S_V7_AP(AP_KRWURW))
+#define L1_S_PROT_KR_v7 (L1_S_V7_AP(AP_V7_KR))
+#define L1_S_PROT_KW_v7 (L1_S_V7_AP(AP_KRW))
+#define L1_S_PROT_MASK_v7 (L1_S_V7_AP(0x07))
#define L1_S_CACHE_MASK_generic (L1_S_B|L1_S_C)
#define L1_S_CACHE_MASK_xscale (L1_S_B|L1_S_C|L1_S_XSCALE_TEX(TEX_XSCALE_X))