diff -r -u -x Makefile.in -x aclocal.m4 -x configure orig/Mesa-10.2.6/src/gallium/winsys/radeon/drm/radeon_drm_bo.c Mesa-10.2.6/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
--- orig/Mesa-10.2.6/src/gallium/winsys/radeon/drm/radeon_drm_bo.c	2014-08-19 13:57:56.000000000 -0700
+++ Mesa-10.2.6/src/gallium/winsys/radeon/drm/radeon_drm_bo.c	2014-09-05 12:56:25.000000000 -0700
@@ -352,9 +352,8 @@
         return NULL;
     }
 
-    ptr = os_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED,
-               bo->rws->fd, args.addr_ptr);
-    if (ptr == MAP_FAILED) {
+    drmMap(bo->rws->fd, args.addr_ptr, args.size, &ptr);
+    if (ptr == NULL) {
         pipe_mutex_unlock(bo->map_mutex);
         fprintf(stderr, "radeon: mmap failed, errno: %i\n", errno);
         return NULL;