summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vgem
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-03-02 06:41:22 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-02 06:41:22 -0500
commit653a7746fa2f5369985f5368ffc162b6510db6c8 (patch)
treebaafa7c7db343fe10a0cf47f27b1471f3c829b7b /drivers/gpu/drm/vgem
parentf6c99aad4d9f3521fe38e552fd2a2e12cdc52418 (diff)
parent0eb8af4916a540c362a2950e5ab54eca32eb7d58 (diff)
downloadlinux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.gz
linux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.bz2
linux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.zip
Merge remote-tracking branch 'ovl/for-viro' into for-linus
Overlayfs-related series from Miklos and Amir
Diffstat (limited to 'drivers/gpu/drm/vgem')
-rw-r--r--drivers/gpu/drm/vgem/vgem_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 477e07f0ecb6..9f7e222b3e89 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -287,7 +287,7 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,
if (!obj->filp)
return -ENODEV;
- ret = obj->filp->f_op->mmap(obj->filp, vma);
+ ret = call_mmap(obj->filp, vma);
if (ret)
return ret;