diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
commit | dffe2a3eed105c631500778dfaba0998d7bf8512 (patch) | |
tree | 4c2492d710e0b101f57a7f399b3e891129b1c8b4 /drivers/infiniband/hw/ipath/ipath_user_sdma.c | |
parent | 3b21b35761de8348dd2f7cff9752449281d7a17b (diff) | |
parent | 538069756ce13f9d0e0ccb7a17b6935a0bfb7cad (diff) |
Merge tag 'v3.10.22' into linux-linaro-lsk
This is the 3.10.22 stable release
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_user_sdma.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_user_sdma.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c index f5cb13b2144..cc04b7ba348 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c +++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c @@ -280,9 +280,7 @@ static int ipath_user_sdma_pin_pages(const struct ipath_devdata *dd, int j; int ret; - ret = get_user_pages(current, current->mm, addr, - npages, 0, 1, pages, NULL); - + ret = get_user_pages_fast(addr, npages, 0, pages); if (ret != npages) { int i; @@ -811,10 +809,7 @@ int ipath_user_sdma_writev(struct ipath_devdata *dd, while (dim) { const int mxp = 8; - down_write(¤t->mm->mmap_sem); ret = ipath_user_sdma_queue_pkts(dd, pq, &list, iov, dim, mxp); - up_write(¤t->mm->mmap_sem); - if (ret <= 0) goto done_unlock; else { |