Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-06-04 20:59:01 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-04 20:59:01 -0700
commitbe5979d3983449eae6f143e0e03fb4ed333529ab (patch)
tree6a3654d6928b2ed43661edd82df77068f6c332f9
parent4dfd32b643ad65fcbf33c0c8bbc7c7df7b8d9180 (diff)
[PATCH] Fix DRM mismerge(?)
From: Colin Leroy <colin@colino.net> Paulus brought this up on IRC, it seems to be a bad DRM merge: The code #ifndef VMAP_4_ARGS if ( dev->agp->cant_use_aperture ) return -EINVAL; #endif in DRM(agp_acquire) should be removed altogether in a 2.6 kernel because its vmap() takes 4 arguments; however, only the guards seem to have been removed, which causes this function to erroneously fail if the AGP aperture can't be directly accessed by the CPU. Signed-off-by: Colin Leroy <colin@colino.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/drm/drm_agpsupport.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_agpsupport.h b/drivers/char/drm/drm_agpsupport.h
index 2abb7fa017ec..aa7fd54bbf9a 100644
--- a/drivers/char/drm/drm_agpsupport.h
+++ b/drivers/char/drm/drm_agpsupport.h
@@ -109,8 +109,6 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp,
return -EBUSY;
if (!drm_agp->acquire)
return -EINVAL;
- if ( dev->agp->cant_use_aperture )
- return -EINVAL;
if ((retcode = drm_agp->acquire()))
return retcode;
dev->agp->acquired = 1;