diff options
| author | Lorenzo Stoakes | 2016-10-13 02:20:17 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-10-19 17:12:02 +0200 |
| commit | 9beae1ea89305a9667ceaab6d0bf46a045ad71e7 (patch) | |
| tree | 32df9181fe7354a3ea2d4cdc8e852a072f2a2346 /drivers/gpu/drm/etnaviv/etnaviv_gem.c | |
| parent | mm: replace get_user_pages() write/force parameters with gup_flags (diff) | |
| download | kernel-qcow2-linux-9beae1ea89305a9667ceaab6d0bf46a045ad71e7.tar.gz kernel-qcow2-linux-9beae1ea89305a9667ceaab6d0bf46a045ad71e7.tar.xz kernel-qcow2-linux-9beae1ea89305a9667ceaab6d0bf46a045ad71e7.zip | |
mm: replace get_user_pages_remote() write/force parameters with gup_flags
This removes the 'write' and 'force' from get_user_pages_remote() and
replaces them with 'gup_flags' to make the use of FOLL_FORCE explicit in
callers as use of this flag can result in surprising behaviour (and
hence bugs) within the mm subsystem.
Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 5ce3603e6eac..0370b842d9cc 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -748,19 +748,22 @@ static struct page **etnaviv_gem_userptr_do_get_pages( int ret = 0, pinned, npages = etnaviv_obj->base.size >> PAGE_SHIFT; struct page **pvec; uintptr_t ptr; + unsigned int flags = 0; pvec = drm_malloc_ab(npages, sizeof(struct page *)); if (!pvec) return ERR_PTR(-ENOMEM); + if (!etnaviv_obj->userptr.ro) + flags |= FOLL_WRITE; + pinned = 0; ptr = etnaviv_obj->userptr.ptr; down_read(&mm->mmap_sem); while (pinned < npages) { ret = get_user_pages_remote(task, mm, ptr, npages - pinned, - !etnaviv_obj->userptr.ro, 0, - pvec + pinned, NULL); + flags, pvec + pinned, NULL); if (ret < 0) break; |