From: Dave Airlie <airlied@linux.ie>
Date: Sat, 10 Apr 2004 07:36:30 +0000 (+0000)
Subject: update from linux kernel for ia64
X-Git-Tag: android-x86-1.6~1633
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fd473357980b9ba40bef089aadb78136faaa2008;p=android-x86%2Fexternal-libdrm.git

update from linux kernel for ia64
---

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 );