summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2003-04-28 15:29:46 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2003-04-28 15:29:46 +0000
commit6eb5364eb81474a6ceac8b44c3283cb0327b2a82 (patch)
tree4b9d64154640b8660d23c79f71dcf38f3ec44c92
parentc584292e30f1f3fc22da32117dfbb72bb79cdbe2 (diff)
DRM_READ/WRITEMEMORYBARRIER was given an argument in the bsd tree, fix for
linux
-rw-r--r--linux-core/drm_os_linux.h5
-rw-r--r--linux/drm_os_linux.h5
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