summaryrefslogtreecommitdiffstats
path: root/vlib
diff options
context:
space:
mode:
Diffstat (limited to 'vlib')
-rw-r--r--vlib/vlib/buffer.h2
-rw-r--r--vlib/vlib/node.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/vlib/vlib/buffer.h b/vlib/vlib/buffer.h
index 4ede684aa4b..5f1e62f08c9 100644
--- a/vlib/vlib/buffer.h
+++ b/vlib/vlib/buffer.h
@@ -56,7 +56,7 @@
#define VLIB_BUFFER_PRE_DATA_SIZE __PRE_DATA_SIZE
#endif
-#ifdef CLIB_HAVE_VEC128
+#if defined (CLIB_HAVE_VEC128) || defined (__aarch64__)
typedef u8x16 vlib_copy_unit_t;
#else
typedef u64 vlib_copy_unit_t;
diff --git a/vlib/vlib/node.c b/vlib/vlib/node.c
index 23f7ea0239e..c419a13a487 100644
--- a/vlib/vlib/node.c
+++ b/vlib/vlib/node.c
@@ -433,9 +433,9 @@ register_node (vlib_main_t * vm, vlib_node_registration_t * r)
for (i = 0; i < vec_len (rt->errors); i++)
rt->errors[i] = vlib_error_set (n->index, i);
- STATIC_ASSERT (sizeof (vlib_node_runtime_t) == 2 * CLIB_CACHE_LINE_BYTES,
- "Size of vlib_node_runtime_t must be equal to 2 cachelines");
- ASSERT (vec_len (n->runtime_data) <= sizeof (vlib_node_runtime_t) -
+ STATIC_ASSERT_SIZEOF (vlib_node_runtime_t, 128);
+ ASSERT (vec_len (n->runtime_data) <=
+ sizeof (vlib_node_runtime_t) -
STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
if (vec_len (n->runtime_data) > 0)