Hi,
compile tested.
-Artturi
Index: sys/arch/arm/include/pmap.h
===================================================================
RCS file: /cvs/src/sys/arch/arm/include/pmap.h,v
retrieving revision 1.38
diff -u -p -u -r1.38 pmap.h
--- sys/arch/arm/include/pmap.h 19 Mar 2016 09:36:57 -0000 1.38
+++ sys/arch/arm/include/pmap.h 21 Mar 2016 23:33:06 -0000
@@ -800,6 +800,7 @@ extern uint32_t pmap_alias_bits;
struct vm_page_md {
struct pv_entry *pvh_list; /* pv_entry list */
int pvh_attrs; /* page attributes */
+#if !defined(CPU_ARMv7)
u_int uro_mappings;
u_int urw_mappings;
union {
@@ -809,8 +810,10 @@ struct vm_page_md {
#define kro_mappings k_u.s_mappings[0]
#define krw_mappings k_u.s_mappings[1]
#define k_mappings k_u.i_mappings
+#endif /* !CPU_ARMv7 */
};
+#if !defined(CPU_ARMv7)
#define VM_MDPAGE_INIT(pg)
\
do { \
(pg)->mdpage.pvh_list = NULL; \
@@ -819,6 +822,13 @@ do {
\
(pg)->mdpage.urw_mappings = 0; \
(pg)->mdpage.k_mappings = 0; \
} while (/*CONSTCOND*/0)
+#else
+#define VM_MDPAGE_INIT(pg)
\
+do { \
+ (pg)->mdpage.pvh_list = NULL; \
+ (pg)->mdpage.pvh_attrs = 0; \
+} while (/*CONSTCOND*/0)
+#endif /* CPU_ARMv7 */
#endif /* _LOCORE */
#endif /* _ARM_PMAP_H_ */