diff options
author | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-05-28 01:44:49 +0000 |
---|---|---|
committer | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-05-28 01:44:49 +0000 |
commit | ccf6d6a5136af3d59a9d93566f55058e9c8480b4 (patch) | |
tree | 30a6880ac151fbbb9d0949f728fa24756590518e | |
parent | d2443b2186712dd7c977b47e06444396e1e493ff (diff) |
Restore DRM_*MEMORYBARRIER change reverted with documentation merge
-rw-r--r-- | linux-core/drm_os_linux.h | 6 | ||||
-rw-r--r-- | linux/drm_os_linux.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h index c5cb65f1..66804c5b 100644 --- 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 c5cb65f1..66804c5b 100644 --- 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 |