diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /net/rds | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'net/rds')
| -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 1f82ec0d2066..dbe111236783 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 *, | |||
| 638 | void rds_rdma_unuse(struct rds_sock *rs, u32 r_key, int force); | 638 | void rds_rdma_unuse(struct rds_sock *rs, u32 r_key, int force); |
| 639 | 639 | ||
| 640 | /* stats.c */ | 640 | /* stats.c */ |
| 641 | DECLARE_PER_CPU(struct rds_statistics, rds_stats); | 641 | DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats); |
| 642 | #define rds_stats_inc_which(which, member) do { \ | 642 | #define rds_stats_inc_which(which, member) do { \ |
| 643 | per_cpu(which, get_cpu()).member++; \ | 643 | per_cpu(which, get_cpu()).member++; \ |
| 644 | put_cpu(); \ | 644 | put_cpu(); \ |