diff options
author | Al Viro | 2017-03-02 12:41:22 +0100 |
---|---|---|
committer | Al Viro | 2017-03-02 12:41:22 +0100 |
commit | 653a7746fa2f5369985f5368ffc162b6510db6c8 (patch) | |
tree | baafa7c7db343fe10a0cf47f27b1471f3c829b7b /drivers/gpu/drm/i915/i915_gem_dmabuf.c | |
parent | Merge branch 'work.namei' into for-linus (diff) | |
parent | vfs: use helper for calling f_op->fsync() (diff) | |
download | kernel-qcow2-linux-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.gz kernel-qcow2-linux-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.xz kernel-qcow2-linux-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/i915/i915_gem_dmabuf.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index d037adcda6f2..29bb8011dbc4 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -141,7 +141,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * if (!obj->base.filp) return -ENODEV; - ret = obj->base.filp->f_op->mmap(obj->base.filp, vma); + ret = call_mmap(obj->base.filp, vma); if (ret) return ret; |