| commit | c9a2433a901250637e05539ef111b91dbc52edb8 | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <roland@purestorage.com> | Tue Jun 04 17:06:46 2013 -0700 |
| committer | Roland Dreier <roland@purestorage.com> | Tue Jun 04 17:06:46 2013 -0700 |
| tree | 48bbe8586a3ce62a9f30acbf2a46e5f36b39f16a | |
| parent | 1e65eb425b660ccd7c8d3ffb353512352690c67f [diff] | |
| parent | f3bdf34465307fc3f6967a9202a921e11505b2e6 [diff] |
Merge branches 'iser' and 'qib' into for-next
diff --git a/drivers/infiniband/hw/qib/qib_keys.c b/drivers/infiniband/hw/qib/qib_keys.c index 81c7b73..3b9afcc 100644 --- a/drivers/infiniband/hw/qib/qib_keys.c +++ b/drivers/infiniband/hw/qib/qib_keys.c
@@ -61,7 +61,7 @@ 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);