Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9a2433a authored by Roland Dreier's avatar Roland Dreier
Browse files

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

parents 1e65eb42 f3bdf344

drivers/infiniband/hw/qib/qib_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -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);