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

josf · Jun 5, 2013 · c9a2433 · c9a2433
2 parents 1e65eb4 + f3bdf34
commit c9a2433
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);