From 6eb5364eb81474a6ceac8b44c3283cb0327b2a82 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Mon, 28 Apr 2003 15:29:46 +0000 Subject: DRM_READ/WRITEMEMORYBARRIER was given an argument in the bsd tree, fix for linux --- linux-core/drm_os_linux.h | 5 ++--- linux/drm_os_linux.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h index e804399a..e0ab6a78 100644 --- a/linux-core/drm_os_linux.h +++ b/linux-core/drm_os_linux.h @@ -12,9 +12,8 @@ #define DRM_READ32(map, offset) readl(((unsigned long)(map)->handle) + (offset)) #define DRM_WRITE8(map, offset, val) writeb(val, ((unsigned long)(map)->handle) + (offset)) #define DRM_WRITE32(map, offset, val) writel(val, ((unsigned long)(map)->handle) + (offset)) -#define DRM_READMEMORYBARRIER() rmb() -#define DRM_WRITEMEMORYBARRIER() wmb() -#define DRM_MEMORYBARRIER() mb() +#define DRM_READMEMORYBARRIER(v) rmb() +#define DRM_WRITEMEMORYBARRIER(v) wmb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h index e804399a..e0ab6a78 100644 --- a/linux/drm_os_linux.h +++ b/linux/drm_os_linux.h @@ -12,9 +12,8 @@ #define DRM_READ32(map, offset) readl(((unsigned long)(map)->handle) + (offset)) #define DRM_WRITE8(map, offset, val) writeb(val, ((unsigned long)(map)->handle) + (offset)) #define DRM_WRITE32(map, offset, val) writel(val, ((unsigned long)(map)->handle) + (offset)) -#define DRM_READMEMORYBARRIER() rmb() -#define DRM_WRITEMEMORYBARRIER() wmb() -#define DRM_MEMORYBARRIER() mb() +#define DRM_READMEMORYBARRIER(v) rmb() +#define DRM_WRITEMEMORYBARRIER(v) wmb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev -- cgit v1.2.3