Merge branches 'iser' and 'qib' into for-next

c9a2433a · Roland Dreier · 1e65eb42 · f3bdf344 · c9a2433a
Commit c9a2433a authored Jun 04, 2013 by Roland Dreier
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/infiniband/hw/qib/qib_keys.c drivers/infiniband/hw/qib/qib_keys.c +1 -1

No files found.
--- 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);