diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-08-20 03:43:33 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-08-20 03:43:33 -0400 |
commit | 88f399cd0a5a540db2815eee3002f8f00ef6461e (patch) | |
tree | ac5d9520a6272c589446e555a1295962e43cae75 /drivers/char/drm/drm_bufs.c | |
parent | ffbbf7a3ccdcac7526296a55968e5dac0626fd9e (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index b70802035d9e..e0743ebbe4bd 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, | |||
152 | switch ( map->type ) { | 152 | switch ( map->type ) { |
153 | case _DRM_REGISTERS: | 153 | case _DRM_REGISTERS: |
154 | case _DRM_FRAME_BUFFER: | 154 | case _DRM_FRAME_BUFFER: |
155 | #if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) | 155 | #if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) |
156 | if ( map->offset + map->size < map->offset || | 156 | if ( map->offset + map->size < map->offset || |
157 | map->offset < virt_to_phys(high_memory) ) { | 157 | map->offset < virt_to_phys(high_memory) ) { |
158 | drm_free( map, sizeof(*map), DRM_MEM_MAPS ); | 158 | drm_free( map, sizeof(*map), DRM_MEM_MAPS ); |
@@ -309,7 +309,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp, | |||
309 | if (put_user(handle, &argp->handle)) | 309 | if (put_user(handle, &argp->handle)) |
310 | return -EFAULT; | 310 | return -EFAULT; |
311 | return 0; | 311 | return 0; |
312 | } | 312 | } |
313 | 313 | ||
314 | 314 | ||
315 | /** | 315 | /** |