From c9eec12be7e67a5dbe314ca909bb58f068b6e430 Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Mon, 6 Sep 2021 19:44:23 +1200 Subject: [PATCH] drm-shim: Explicitly use off64_t for the offset to drm_shim_mmap drm_shim.c undefines the _FILE_OFFSET_BITS macro, so plain off_t might be 32 bits, while it's 64 bits in device.c. To avoid this mismatch, use off64_t which will always be 64 bits in both source files. Reviewed-by: Emma Anholt Part-of: --- src/drm-shim/device.c | 2 +- src/drm-shim/drm_shim.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drm-shim/device.c b/src/drm-shim/device.c index 211eb2e5781..fecdb1fcd21 100644 --- a/src/drm-shim/device.c +++ b/src/drm-shim/device.c @@ -373,7 +373,7 @@ drm_shim_bo_get_mmap_offset(struct shim_fd *shim_fd, struct shim_bo *bo) */ void * drm_shim_mmap(struct shim_fd *shim_fd, size_t length, int prot, int flags, - int fd, off_t offset) + int fd, off64_t offset) { struct shim_bo *bo = (void *)(uintptr_t)offset; diff --git a/src/drm-shim/drm_shim.h b/src/drm-shim/drm_shim.h index cb3951afa82..dbb831747da 100644 --- a/src/drm-shim/drm_shim.h +++ b/src/drm-shim/drm_shim.h @@ -83,7 +83,7 @@ void drm_shim_fd_register(int fd, struct shim_fd *shim_fd); struct shim_fd *drm_shim_fd_lookup(int fd); int drm_shim_ioctl(int fd, unsigned long request, void *arg); void *drm_shim_mmap(struct shim_fd *shim_fd, size_t length, int prot, int flags, - int fd, off_t offset); + int fd, off64_t offset); void drm_shim_bo_init(struct shim_bo *bo, size_t size); void drm_shim_bo_get(struct shim_bo *bo);