Message ID | 20180523113630.29811-1-andr2000@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 23/05/18 13:36, Oleksandr Andrushchenko wrote: > From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> > > Building for a 32-bit target results in warnings from casting > between a 32-bit pointer and a 64-bit integer. Fix the warnings > by casting those pointers to uintptr_t first. > > Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Reviewed-by: Juergen Gross <jgross@suse.com> Juergen
On 05/23/2018 02:46 PM, Juergen Gross wrote: > On 23/05/18 13:36, Oleksandr Andrushchenko wrote: >> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> >> >> Building for a 32-bit target results in warnings from casting >> between a 32-bit pointer and a 64-bit integer. Fix the warnings >> by casting those pointers to uintptr_t first. >> >> Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> > Reviewed-by: Juergen Gross <jgross@suse.com> Thank you, applied to drm-misc-next > > Juergen
Hi, On 25/05/18 06:32, Oleksandr Andrushchenko wrote: > On 05/23/2018 02:46 PM, Juergen Gross wrote: >> On 23/05/18 13:36, Oleksandr Andrushchenko wrote: >>> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> >>> >>> Building for a 32-bit target results in warnings from casting >>> between a 32-bit pointer and a 64-bit integer. Fix the warnings >>> by casting those pointers to uintptr_t first. >>> >>> Signed-off-by: Oleksandr Andrushchenko >>> <oleksandr_andrushchenko@epam.com> >> Reviewed-by: Juergen Gross <jgross@suse.com> > Thank you, applied to drm-misc-next Is this the right branch? Shouldn't this go to drm-misc-fixes instead, so it reaches the tree before the 4.18 release? Just stumbled over the issue when compiling 4.18-rc1 for arm32, so it definitely needs fixing in this cycle. Cheers, Andre.
On 06/18/2018 01:06 PM, Andre Przywara wrote: > Hi, > > On 25/05/18 06:32, Oleksandr Andrushchenko wrote: >> On 05/23/2018 02:46 PM, Juergen Gross wrote: >>> On 23/05/18 13:36, Oleksandr Andrushchenko wrote: >>>> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> >>>> >>>> Building for a 32-bit target results in warnings from casting >>>> between a 32-bit pointer and a 64-bit integer. Fix the warnings >>>> by casting those pointers to uintptr_t first. >>>> >>>> Signed-off-by: Oleksandr Andrushchenko >>>> <oleksandr_andrushchenko@epam.com> >>> Reviewed-by: Juergen Gross <jgross@suse.com> >> Thank you, applied to drm-misc-next > Is this the right branch? Shouldn't this go to drm-misc-fixes instead, > so it reaches the tree before the 4.18 release? > Just stumbled over the issue when compiling 4.18-rc1 for arm32, so it > definitely needs fixing in this cycle. Maarten, can this be done please? > Cheers, > Andre. Thank you, Oleksandr
diff --git a/drivers/gpu/drm/xen/xen_drm_front.h b/drivers/gpu/drm/xen/xen_drm_front.h index 2c2479b571ae..5693b4a4b02b 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.h +++ b/drivers/gpu/drm/xen/xen_drm_front.h @@ -126,12 +126,12 @@ struct xen_drm_front_drm_info { static inline u64 xen_drm_front_fb_to_cookie(struct drm_framebuffer *fb) { - return (u64)fb; + return (uintptr_t)fb; } static inline u64 xen_drm_front_dbuf_to_cookie(struct drm_gem_object *gem_obj) { - return (u64)gem_obj; + return (uintptr_t)gem_obj; } int xen_drm_front_mode_set(struct xen_drm_front_drm_pipeline *pipeline, diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c index 8099cb343ae3..d333b67cc1a0 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c @@ -122,7 +122,7 @@ static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) } #define xen_page_to_vaddr(page) \ - ((phys_addr_t)pfn_to_kaddr(page_to_xen_pfn(page))) + ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page))) static int backend_unmap(struct xen_drm_front_shbuf *buf) {