diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 00:29:14 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 00:29:14 +0000 |
| commit | c14006ba9f0522875327998215150067d8ca6ea7 (patch) | |
| tree | 08290dadd19103f357082bbd51dc9d6cea5f648a /linux-core/drm_os_linux.h | |
| parent | 0bd0dd2300e91707ae5a41a83eb37217fd8ad295 (diff) | |
XFree86 4.3.0 merge
Diffstat (limited to 'linux-core/drm_os_linux.h')
| -rw-r--r-- | linux-core/drm_os_linux.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h index b99b4899..e9b24356 100644 --- a/linux-core/drm_os_linux.h +++ b/linux-core/drm_os_linux.h @@ -7,12 +7,12 @@ #define DRM_ERR(d) -(d) #define DRM_CURRENTPID current->pid #define DRM_UDELAY(d) udelay(d) -#define DRM_READ8(map, offset) readb(((unsigned long)(map)->handle) + (offset)) -#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(map) mb() -#define DRM_WRITEMEMORYBARRIER(map) wmb() +#define DRM_READ8(addr) readb(addr) +#define DRM_READ32(addr) readl(addr) +#define DRM_WRITE8(addr, val) writeb(val, addr) +#define DRM_WRITE32(addr, val) writel(val, addr) +#define DRM_READMEMORYBARRIER() mb() +#define DRM_WRITEMEMORYBARRIER() wmb() #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev @@ -42,7 +42,7 @@ /* malloc/free without the overhead of DRM(alloc) */ #define DRM_MALLOC(x) kmalloc(x, GFP_KERNEL) -#define DRM_FREE(x,size) kfree(x) +#define DRM_FREE(x) kfree(x) #define DRM_GETSAREA() \ do { \ |