diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 06:41:22 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 06:41:22 -0500 |
| commit | 653a7746fa2f5369985f5368ffc162b6510db6c8 (patch) | |
| tree | baafa7c7db343fe10a0cf47f27b1471f3c829b7b /drivers/gpu | |
| parent | f6c99aad4d9f3521fe38e552fd2a2e12cdc52418 (diff) | |
| parent | 0eb8af4916a540c362a2950e5ab54eca32eb7d58 (diff) | |
Merge remote-tracking branch 'ovl/for-viro' into for-linus
Overlayfs-related series from Miklos and Amir
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/vgem/vgem_drv.c | 2 |
2 files changed, 2 insertions, 2 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 * | |||
| 141 | if (!obj->base.filp) | 141 | if (!obj->base.filp) |
| 142 | return -ENODEV; | 142 | return -ENODEV; |
| 143 | 143 | ||
| 144 | ret = obj->base.filp->f_op->mmap(obj->base.filp, vma); | 144 | ret = call_mmap(obj->base.filp, vma); |
| 145 | if (ret) | 145 | if (ret) |
| 146 | return ret; | 146 | return ret; |
| 147 | 147 | ||
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, | |||
| 287 | if (!obj->filp) | 287 | if (!obj->filp) |
| 288 | return -ENODEV; | 288 | return -ENODEV; |
| 289 | 289 | ||
| 290 | ret = obj->filp->f_op->mmap(obj->filp, vma); | 290 | ret = call_mmap(obj->filp, vma); |
| 291 | if (ret) | 291 | if (ret) |
| 292 | return ret; | 292 | return ret; |
| 293 | 293 | ||