aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/drm/drm_bufs.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-08-20 17:43:33 +1000
committerDave Airlie <airlied@linux.ie>2005-08-20 17:43:33 +1000
commit88f399cd0a5a540db2815eee3002f8f00ef6461e (patch)
treeac5d9520a6272c589446e555a1295962e43cae75 /drivers/char/drm/drm_bufs.c
parentffbbf7a3ccdcac7526296a55968e5dac0626fd9e (diff)
drm: fixes for powerpc
Remove a bogus check on whether an area is memory (we need a better interface) also change pgprot flags for powerpc don't check on x86-64 either From: Paul Mackerras <paulus@samba.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_bufs.c')
-rw-r--r--drivers/char/drm/drm_bufs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index b70802035d9..e0743ebbe4b 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -152,7 +152,7 @@ int drm_addmap(drm_device_t * dev, unsigned int offset,
switch ( map->type ) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__)
if ( map->offset + map->size < map->offset ||
map->offset < virt_to_phys(high_memory) ) {
drm_free( map, sizeof(*map), DRM_MEM_MAPS );
@@ -309,7 +309,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
if (put_user(handle, &argp->handle))
return -EFAULT;
return 0;
- }
+}
/**