From 6c9d13410be2b6d3b411ade55d1eafbcb7bef313 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sun, 9 Feb 2020 13:00:22 +0100 Subject: [PATCH] common/mlx5: replace alignas keyword The keyword alignas can be replaced with __rte_aligned macro for consistency and allow compilers compatibility control. The macro __rte_cache_aligned is a shortcut including __rte_aligned and RTE_CACHE_LINE_SIZE constant. Signed-off-by: Thomas Monjalon --- drivers/common/mlx5/mlx5_glue.c | 4 ++-- drivers/common/mlx5/mlx5_nl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c index 0af0b86677..428de0ffd9 100644 --- a/drivers/common/mlx5/mlx5_glue.c +++ b/drivers/common/mlx5/mlx5_glue.c @@ -1182,8 +1182,8 @@ mlx5_glue_dv_free_var(struct mlx5dv_var *var) #endif } -alignas(RTE_CACHE_LINE_SIZE) -const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){ +__rte_cache_aligned +const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) { .version = MLX5_GLUE_VERSION, .fork_init = mlx5_glue_fork_init, .alloc_pd = mlx5_glue_alloc_pd, diff --git a/drivers/common/mlx5/mlx5_nl.c b/drivers/common/mlx5/mlx5_nl.c index 549e787b04..d9f0d4129e 100644 --- a/drivers/common/mlx5/mlx5_nl.c +++ b/drivers/common/mlx5/mlx5_nl.c @@ -1342,7 +1342,7 @@ mlx5_nl_vlan_vmwa_create(struct mlx5_nl_vlan_vmwa_context *vmwa, struct ifinfomsg *ifm; char name[sizeof(MLX5_VMWA_VLAN_DEVICE_PFX) + 32]; - alignas(RTE_CACHE_LINE_SIZE) + __rte_cache_aligned uint8_t buf[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)) + NLMSG_ALIGN(sizeof(struct nlattr)) * 8 +