From ebbb8f9cbfc3b51d52e6fe3b146ea824030eb48a Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Wed, 24 Apr 2019 10:08:36 -0700 Subject: [PATCH] libdrm: Use mmap64 instead of __mmap2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __mmap2 isn't supported on all platforms, mmap64 is the right way to do this in android. Also folds in a fix from Stéphane Marchesin Cc: Sean Paul Cc: Alistair Strachan Cc: Marissa Wall Acked-by: Alex Deucher Reviewed-by: Emil Velikov Signed-off-by: Sean Paul [jstultz: Folded in Stéphane's fix] Signed-off-by: John Stultz --- libdrm_macros.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libdrm_macros.h b/libdrm_macros.h index 95f0ef55..0dca8273 100644 --- a/libdrm_macros.h +++ b/libdrm_macros.h @@ -48,8 +48,6 @@ #if defined(ANDROID) && !defined(__LP64__) #include /* for EINVAL */ -extern void *__mmap2(void *, size_t, int, int, int, size_t); - static inline void *drm_mmap(void *addr, size_t length, int prot, int flags, int fd, loff_t offset) { @@ -59,7 +57,7 @@ static inline void *drm_mmap(void *addr, size_t length, int prot, int flags, return MAP_FAILED; } - return __mmap2(addr, length, prot, flags, fd, (size_t) (offset >> 12)); + return mmap64(addr, length, prot, flags, fd, offset); } # define drm_munmap(addr, length) \