diff options
| author | Roland Dreier <roland@purestorage.com> | 2013-06-04 20:06:46 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2013-06-04 20:06:46 -0400 |
| commit | c9a2433a901250637e05539ef111b91dbc52edb8 (patch) | |
| tree | 48bbe8586a3ce62a9f30acbf2a46e5f36b39f16a /drivers/infiniband | |
| parent | 1e65eb425b660ccd7c8d3ffb353512352690c67f (diff) | |
| parent | f3bdf34465307fc3f6967a9202a921e11505b2e6 (diff) | |
Merge branches 'iser' and 'qib' into for-next
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_keys.c b/drivers/infiniband/hw/qib/qib_keys.c index 81c7b73695d2..3b9afccaaade 100644 --- a/drivers/infiniband/hw/qib/qib_keys.c +++ b/drivers/infiniband/hw/qib/qib_keys.c | |||
| @@ -61,7 +61,7 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region) | |||
| 61 | if (dma_region) { | 61 | if (dma_region) { |
| 62 | struct qib_mregion *tmr; | 62 | struct qib_mregion *tmr; |
| 63 | 63 | ||
| 64 | tmr = rcu_dereference(dev->dma_mr); | 64 | tmr = rcu_access_pointer(dev->dma_mr); |
| 65 | if (!tmr) { | 65 | if (!tmr) { |
| 66 | qib_get_mr(mr); | 66 | qib_get_mr(mr); |
| 67 | rcu_assign_pointer(dev->dma_mr, mr); | 67 | rcu_assign_pointer(dev->dma_mr, mr); |