diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 11:12:55 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 11:12:55 +0200 |
commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /net/rds/rds.h | |
parent | ASoC: TWL4030: Add VIBRA output (diff) | |
parent | Merge branch 'fix/asoc' into topic/asoc (diff) | |
download | linux-f3831a592fe4332a70baad64a860b345398885b7.tar.xz linux-f3831a592fe4332a70baad64a860b345398885b7.zip |
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'net/rds/rds.h')
-rw-r--r-- | net/rds/rds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h index 619f0a30a4e5..71794449ca4e 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -638,7 +638,7 @@ struct rds_message *rds_send_get_message(struct rds_connection *, void rds_rdma_unuse(struct rds_sock *rs, u32 r_key, int force); /* stats.c */ -DECLARE_PER_CPU(struct rds_statistics, rds_stats); +DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats); #define rds_stats_inc_which(which, member) do { \ per_cpu(which, get_cpu()).member++; \ put_cpu(); \ |