summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-04-10 07:36:30 +0000
committerDave Airlie <airlied@linux.ie>2004-04-10 07:36:30 +0000
commitfd473357980b9ba40bef089aadb78136faaa2008 (patch)
tree75cd36312fa820cd75d86fe8e9d81b10db079178
parentf673c9280c2691063534062fb9fdea74ad85b18a (diff)
update from linux kernel for ia64
-rw-r--r--linux-core/drm_bufs.c2
-rw-r--r--linux/drm_bufs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 577a1c99..d50090bb 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -131,7 +131,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
switch ( map->type ) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
if ( map->offset + map->size < map->offset ||
map->offset < virt_to_phys(high_memory) ) {
DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index 577a1c99..d50090bb 100644
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -131,7 +131,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
switch ( map->type ) {
case _DRM_REGISTERS:
case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
if ( map->offset + map->size < map->offset ||
map->offset < virt_to_phys(high_memory) ) {
DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );