xnu-4570.1.46.tar.gz

[apple/xnu.git] / bsd / net / radix.h

diff --git a/bsd/net/radix.h b/bsd/net/radix.h
index d48399aae2b83465abe6b7b9b540f6a147e1dc8d..78f251b224f22ec38817e40a4cdbcd5fa2d55285 100644 (file)
--- a/bsd/net/radix.h
+++ b/bsd/net/radix.h
@@ -102,7 +102,15 @@ struct radix_node {
        struct radix_node *rn_ybro;
 #endif
 
+#if __arm__ && (__BIGGEST_ALIGNMENT__ > 4)
+/* For the newer ARMv7k ABI where 64-bit types are 64-bit aligned, but pointers
+ * are 32-bit:
+ * Aligned to 64-bit since this is cast to rtentry, which is 64-bit aligned.
+ */
+} __attribute__ ((aligned(8)));
+#else
 };
+#endif
 
 #define        rn_dupedkey     rn_u.rn_leaf.rn_Dupedkey
 #define        rn_key          rn_u.rn_leaf.rn_Key