summaryrefslogtreecommitdiff
path: root/libdrm/xf86drm.c
diff options
context:
space:
mode:
Diffstat (limited to 'libdrm/xf86drm.c')
-rw-r--r--libdrm/xf86drm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index e4bc53bc..c561f01f 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -27,7 +27,7 @@
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
* Kevin E. Martin <martin@valinux.com>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.14 2000/06/27 16:42:07 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.15 2000/08/09 14:44:27 alanh Exp $
*
*/
@@ -71,8 +71,6 @@ extern int xf86RemoveSIGIOHandler(int fd);
#ifdef __alpha__
extern unsigned long _bus_base(void);
#define BUS_BASE _bus_base()
-#else
-#define BUS_BASE (0)
#endif
/* Not all systems have MAP_FAILED defined */
@@ -504,7 +502,8 @@ int drmAddMap(int fd,
map.offset = offset;
#ifdef __alpha__
- if (!(type & DRM_SHM))
+ /* Make sure we add the bus_base to all but shm */
+ if (type != DRM_SHM)
map.offset += BUS_BASE;
#endif
map.size = size;