From aed4b141eac230a5a68fe10371f8517e8fda5e63 Mon Sep 17 00:00:00 2001 From: Aleksei Nikiforov Date: Thu, 10 Dec 2020 17:45:56 +0300 Subject: [PATCH] Fix alignment and structure size for 32-bit systems --- rd_stats.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rd_stats.h b/rd_stats.h index e05ba32..f48c7f3 100644 --- a/rd_stats.h +++ b/rd_stats.h @@ -711,9 +711,9 @@ struct stats_softnet { /* Structure for pressure-stall CPU statistics */ struct stats_psi_cpu { unsigned long long some_cpu_total; - unsigned long some_acpu_10; - unsigned long some_acpu_60; - unsigned long some_acpu_300; + unsigned long some_acpu_10 __attribute__ ((aligned (8))); + unsigned long some_acpu_60 __attribute__ ((aligned (8))); + unsigned long some_acpu_300 __attribute__ ((aligned (8))); }; #define STATS_PSI_CPU_SIZE (sizeof(struct stats_psi_cpu)) @@ -725,12 +725,12 @@ struct stats_psi_cpu { struct stats_psi_io { unsigned long long some_io_total; unsigned long long full_io_total; - unsigned long some_aio_10; - unsigned long some_aio_60; - unsigned long some_aio_300; - unsigned long full_aio_10; - unsigned long full_aio_60; - unsigned long full_aio_300; + unsigned long some_aio_10 __attribute__ ((aligned (8))); + unsigned long some_aio_60 __attribute__ ((aligned (8))); + unsigned long some_aio_300 __attribute__ ((aligned (8))); + unsigned long full_aio_10 __attribute__ ((aligned (8))); + unsigned long full_aio_60 __attribute__ ((aligned (8))); + unsigned long full_aio_300 __attribute__ ((aligned (8))); }; #define STATS_PSI_IO_SIZE (sizeof(struct stats_psi_io)) @@ -742,12 +742,12 @@ struct stats_psi_io { struct stats_psi_mem { unsigned long long some_mem_total; unsigned long long full_mem_total; - unsigned long some_amem_10; - unsigned long some_amem_60; - unsigned long some_amem_300; - unsigned long full_amem_10; - unsigned long full_amem_60; - unsigned long full_amem_300; + unsigned long some_amem_10 __attribute__ ((aligned (8))); + unsigned long some_amem_60 __attribute__ ((aligned (8))); + unsigned long some_amem_300 __attribute__ ((aligned (8))); + unsigned long full_amem_10 __attribute__ ((aligned (8))); + unsigned long full_amem_60 __attribute__ ((aligned (8))); + unsigned long full_amem_300 __attribute__ ((aligned (8))); }; #define STATS_PSI_MEM_SIZE (sizeof(struct stats_psi_mem)) -- 2.25.4