leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roland Dreier 2013-06-04 17:06:46 -07:00
commit c9a2433a90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/qib/qib_keys.c
View File

@ -61,7 +61,7 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region)
if (dma_region) { if (dma_region) {
struct qib_mregion *tmr; struct qib_mregion *tmr;
tmr = rcu_dereference(dev->dma_mr); tmr = rcu_access_pointer(dev->dma_mr);
if (!tmr) { if (!tmr) {
qib_get_mr(mr); qib_get_mr(mr);
rcu_assign_pointer(dev->dma_mr, mr); rcu_assign_pointer(dev->dma_mr, mr);