aboutsummaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-06-04 17:06:46 -0700
committerRoland Dreier <roland@purestorage.com>2013-06-04 17:06:46 -0700
commitc9a2433a901250637e05539ef111b91dbc52edb8 (patch)
tree48bbe8586a3ce62a9f30acbf2a46e5f36b39f16a /drivers/infiniband
parent1e65eb425b660ccd7c8d3ffb353512352690c67f (diff)
parentf3bdf34465307fc3f6967a9202a921e11505b2e6 (diff)
downloadlinux-linaro-stable-c9a2433a901250637e05539ef111b91dbc52edb8.tar.gz
Merge branches 'iser' and 'qib' into for-next
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/qib/qib_keys.c2
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)
if (dma_region) {
struct qib_mregion *tmr;
- tmr = rcu_dereference(dev->dma_mr);
+ tmr = rcu_access_pointer(dev->dma_mr);
if (!tmr) {
qib_get_mr(mr);
rcu_assign_pointer(dev->dma_mr, mr);