diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 (patch) | |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c /net/rds/ib.c | |
| parent | e22af0be2cf654bb225f19750c6b9aab1627dc9e (diff) | |
| parent | 2d6be4abf514fc26c83d239c7f31da1f95e4a31d (diff) | |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
Conflicts:
arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rds/ib.c')
| -rw-r--r-- | net/rds/ib.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/rds/ib.c b/net/rds/ib.c index 5680d90b0b77..91fe46f1e4cc 100644 --- a/net/rds/ib.c +++ b/net/rds/ib.c @@ -111,6 +111,8 @@ static void rds_ib_dev_free(struct work_struct *work) kfree(i_ipaddr); } + kfree(rds_ibdev->vector_load); + kfree(rds_ibdev); } @@ -159,6 +161,14 @@ static void rds_ib_add_one(struct ib_device *device) rds_ibdev->max_initiator_depth = device->attrs.max_qp_init_rd_atom; rds_ibdev->max_responder_resources = device->attrs.max_qp_rd_atom; + rds_ibdev->vector_load = kzalloc(sizeof(int) * device->num_comp_vectors, + GFP_KERNEL); + if (!rds_ibdev->vector_load) { + pr_err("RDS/IB: %s failed to allocate vector memory\n", + __func__); + goto put_dev; + } + rds_ibdev->dev = device; rds_ibdev->pd = ib_alloc_pd(device, 0); if (IS_ERR(rds_ibdev->pd)) { |