diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/rds/ib_stats.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/rds/ib_stats.c')
| -rw-r--r-- | net/rds/ib_stats.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c index d2c904dd6fbc..2d5965d6e97c 100644 --- a/net/rds/ib_stats.c +++ b/net/rds/ib_stats.c | |||
| @@ -67,6 +67,8 @@ static const char *const rds_ib_stat_names[] = { | |||
| 67 | "ib_rdma_mr_pool_flush", | 67 | "ib_rdma_mr_pool_flush", |
| 68 | "ib_rdma_mr_pool_wait", | 68 | "ib_rdma_mr_pool_wait", |
| 69 | "ib_rdma_mr_pool_depleted", | 69 | "ib_rdma_mr_pool_depleted", |
| 70 | "ib_atomic_cswp", | ||
| 71 | "ib_atomic_fadd", | ||
| 70 | }; | 72 | }; |
| 71 | 73 | ||
| 72 | unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter, | 74 | unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter, |