| Message ID | 20170131185849.8297-2-liviu@dudau.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Liviu, Am Dienstag, den 31.01.2017, 18:58 +0000 schrieb Liviu Dudau: > Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite > to take only vmf") updated the etnaviv_gem_fault() function signature > without updating the header file with the declaration. > There is already a patch from Arnd on the list that fixes this issue. https://lkml.org/lkml/2017/1/25/718 Regards, Lucas > Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") > Cc: Dave Jiang <dave.jiang@intel.com> > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Russell King <linux+etnaviv@armlinux.org.uk> > Cc: Christian Gmeiner <christian.gmeiner@gmail.com> > Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > --- > drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > index c255eda40526..e41f38667c1c 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, > struct drm_file *file); > > int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); > -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); > +int etnaviv_gem_fault(struct vm_fault *vmf); > int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); > struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj); > void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);
On Wed, Feb 01, 2017 at 10:26:08AM +0100, Lucas Stach wrote: > Hi Liviu, > > Am Dienstag, den 31.01.2017, 18:58 +0000 schrieb Liviu Dudau: > > Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite > > to take only vmf") updated the etnaviv_gem_fault() function signature > > without updating the header file with the declaration. > > > There is already a patch from Arnd on the list that fixes this issue. Sorry, my search-fu was not strong enough. Thanks for pointing it out. Best regards, Liviu > > https://lkml.org/lkml/2017/1/25/718 > > Regards, > Lucas > > > Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") > > Cc: Dave Jiang <dave.jiang@intel.com> > > Cc: Lucas Stach <l.stach@pengutronix.de> > > Cc: Russell King <linux+etnaviv@armlinux.org.uk> > > Cc: Christian Gmeiner <christian.gmeiner@gmail.com> > > Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > > --- > > drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > index c255eda40526..e41f38667c1c 100644 > > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h > > @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, > > struct drm_file *file); > > > > int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); > > -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); > > +int etnaviv_gem_fault(struct vm_fault *vmf); > > int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); > > struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj); > > void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index c255eda40526..e41f38667c1c 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file); int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); +int etnaviv_gem_fault(struct vm_fault *vmf); int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj); void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);
Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") updated the etnaviv_gem_fault() function signature without updating the header file with the declaration. Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") Cc: Dave Jiang <dave.jiang@intel.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Russell King <linux+etnaviv@armlinux.org.uk> Cc: Christian Gmeiner <christian.gmeiner@gmail.com> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> --- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)