Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / net / rds / ib_stats.c

diff --git a/net/rds/ib_stats.c b/net/rds/ib_stats.c
index 2d5965d6e97c039517d219bfdad3f28f7437b1d7..d77e0447305630d721760542ced368f86a9e15f9 100644 (file)
--- a/net/rds/ib_stats.c
+++ b/net/rds/ib_stats.c
@@ -42,14 +42,14 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);
 static const char *const rds_ib_stat_names[] = {
        "ib_connect_raced",
        "ib_listen_closed_stale",
-       "ib_tx_cq_call",
+       "s_ib_evt_handler_call",
+       "ib_tasklet_call",
        "ib_tx_cq_event",
        "ib_tx_ring_full",
        "ib_tx_throttle",
        "ib_tx_sg_mapping_failure",
        "ib_tx_stalled",
        "ib_tx_credit_updates",
-       "ib_rx_cq_call",
        "ib_rx_cq_event",
        "ib_rx_ring_empty",
        "ib_rx_refill_from_cq",
@@ -61,12 +61,18 @@ static const char *const rds_ib_stat_names[] = {
        "ib_ack_send_delayed",
        "ib_ack_send_piggybacked",
        "ib_ack_received",
-       "ib_rdma_mr_alloc",
-       "ib_rdma_mr_free",
-       "ib_rdma_mr_used",
-       "ib_rdma_mr_pool_flush",
-       "ib_rdma_mr_pool_wait",
-       "ib_rdma_mr_pool_depleted",
+       "ib_rdma_mr_8k_alloc",
+       "ib_rdma_mr_8k_free",
+       "ib_rdma_mr_8k_used",
+       "ib_rdma_mr_8k_pool_flush",
+       "ib_rdma_mr_8k_pool_wait",
+       "ib_rdma_mr_8k_pool_depleted",
+       "ib_rdma_mr_1m_alloc",
+       "ib_rdma_mr_1m_free",
+       "ib_rdma_mr_1m_used",
+       "ib_rdma_mr_1m_pool_flush",
+       "ib_rdma_mr_1m_pool_wait",
+       "ib_rdma_mr_1m_pool_depleted",
        "ib_atomic_cswp",
        "ib_atomic_fadd",
 };