drm: Branch 'master'

 tests/nouveau/threaded.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit cd77f114ca0073f609fc89d22390152945e73107
Author: Ross Burton <[email protected]>
Date:   Mon Jun 18 15:07:03 2018 +0100

    tests/nouveau/threaded: adapt ioctl signature
    
    POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
    use (int, unsigned long int, ...) instead.
    
    Use a #ifdef to adapt the replacement function as appropriate.
    
    Signed-off-by: Ross Burton <[email protected]>
    
    [Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch]
    Signed-off-by: Peter Seiderer <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
index 3669bcd3..e1c27c01 100644
--- a/tests/nouveau/threaded.c
+++ b/tests/nouveau/threaded.c
@@ -36,7 +36,11 @@ static int failed;
 
 static int import_fd;
 
+#ifdef __GLIBC__
 int ioctl(int fd, unsigned long request, ...)
+#else
+int ioctl(int fd, int request, ...)
+#endif
 {
 	va_list va;
 	int ret;


--