Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...

[~andy/linux] / net / rds / ib_stats.c

diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c
index 8d8488306fe4979374dad7ac05fbc4b8b1e3a67c..d2c904dd6fbcb9e1eeb275f84cc062a273bb98ec 100644 (file)
--- a/net/rds/ib_stats.c
+++ b/net/rds/ib_stats.c
@@ -37,7 +37,7 @@
 #include "rds.h"
 #include "ib.h"
 
-DEFINE_PER_CPU(struct rds_ib_statistics, rds_ib_stats) ____cacheline_aligned;
+DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);
 
 static const char *const rds_ib_stat_names[] = {
        "ib_connect_raced",