diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
| commit | b6815f354518591400ce4c3a5fd63337643710ff (patch) | |
| tree | 14f8a117b4556f7dba5a5a9ccebc5e3b204cbd56 /drivers/infiniband/hw/mlx5/mr.c | |
| parent | a0a8f2ada3f50f0190ebcbb60e77e697444c470e (diff) | |
| parent | 89876f275e8d562912d9c238cd888b52065cf25c (diff) | |
| download | linux-b6815f354518591400ce4c3a5fd63337643710ff.tar.bz2 | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mr.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index ee0ee1f9994b..d109fe8290a7 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1637,6 +1637,7 @@ struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, MLX5_SET(mkc, mkc, access_mode, mr->access_mode); MLX5_SET(mkc, mkc, umr_en, 1); + mr->ibmr.device = pd->device; err = mlx5_core_create_mkey(dev->mdev, &mr->mmkey, in, inlen); if (err) goto err_destroy_psv; |