diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:53:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:53:04 +1100 |
| commit | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (patch) | |
| tree | e36b518353cf1b36c20a8b315de17ea8ee577c39 /drivers/gpu/drm/etnaviv/etnaviv_gem.c | |
| parent | 200445685b48a1f4eb8e4abb4ae46f22236b1197 (diff) | |
| parent | 1224d22e9f1c57618e6db3737c17f8a1e0927d18 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index aa6e35ddc87f..e78f1406885d 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -175,8 +175,9 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma) return obj->ops->mmap(obj, vma); } -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +int etnaviv_gem_fault(struct vm_fault *vmf) { + struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); struct page **pages, *page; |