Restore DRM_*MEMORYBARRIER change reverted with documentation merge

diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index c5cb65f..66804c5 100644 (file)
--- a/linux-core/drm_os_linux.h
+++ b/linux-core/drm_os_linux.h
@@ -25,11 +25,11 @@
 /** Write a dword into a MMIO region */
 #define DRM_WRITE32(map, offset, val)  writel(val, ((unsigned long)(map)->handle) + (offset))
 /** Read memory barrier */
-#define DRM_READMEMORYBARRIER(map)     rmb()
+#define DRM_READMEMORYBARRIER()                rmb()
 /** Write memory barrier */
-#define DRM_WRITEMEMORYBARRIER(map)    wmb()
+#define DRM_WRITEMEMORYBARRIER()       wmb()
 /** Read/write memory barrier */
-#define DRM_MEMORYBARRIER(map) mb()
+#define DRM_MEMORYBARRIER()            mb()
 /** DRM device local declaration */
 #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 c5cb65f..66804c5 100644 (file)
--- a/linux/drm_os_linux.h
+++ b/linux/drm_os_linux.h
@@ -25,11 +25,11 @@
 /** Write a dword into a MMIO region */
 #define DRM_WRITE32(map, offset, val)  writel(val, ((unsigned long)(map)->handle) + (offset))
 /** Read memory barrier */
-#define DRM_READMEMORYBARRIER(map)     rmb()
+#define DRM_READMEMORYBARRIER()                rmb()
 /** Write memory barrier */
-#define DRM_WRITEMEMORYBARRIER(map)    wmb()
+#define DRM_WRITEMEMORYBARRIER()       wmb()
 /** Read/write memory barrier */
-#define DRM_MEMORYBARRIER(map) mb()
+#define DRM_MEMORYBARRIER()            mb()
 /** DRM device local declaration */
 #define DRM_DEVICE     drm_file_t      *priv   = filp->private_data; \
                        drm_device_t    *dev    = priv->dev