Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / etnaviv / etnaviv_gem.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 937a77520f58142ea7c65b12d64be1ac5137db05..281c6eca20a85524cc34b615f5bc5d0567b4d7ba 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -761,9 +761,9 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
 
        down_read(&mm->mmap_sem);
        while (pinned < npages) {
-               ret = get_user_pages(task, mm, ptr, npages - pinned,
-                                    !etnaviv_obj->userptr.ro, 0,
-                                    pvec + pinned, NULL);
+               ret = get_user_pages_remote(task, mm, ptr, npages - pinned,
+                                           !etnaviv_obj->userptr.ro, 0,
+                                           pvec + pinned, NULL);
                if (ret < 0)
                        break;