projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
908f9c4
)
drm: missing drm_vm.c changes for consistent maps
author
Dave Airlie
<airlied@starflyer.(none)>
Sun, 11 Sep 2005 09:37:29 +0000
(19:37 +1000)
committer
Dave Airlie
<airlied@linux.ie>
Sun, 11 Sep 2005 09:37:29 +0000
(19:37 +1000)
This adds a missing change from CVS for consistent maps.
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drm_vm.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/char/drm/drm_vm.c
b/drivers/char/drm/drm_vm.c
index ced4215e2275e71dad67a2db787054bb03bfc12f..a13d07f44202eaca6d010f327d159fe7099c1f47 100644
(file)
--- a/
drivers/char/drm/drm_vm.c
+++ b/
drivers/char/drm/drm_vm.c
@@
-148,7
+148,8
@@
static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
offset = address - vma->vm_start;
i = (unsigned long)map->handle + offset;
- page = vmalloc_to_page((void *)i);
+ page = (map->type == _DRM_CONSISTENT) ?
+ virt_to_page((void *)i) : vmalloc_to_page((void *)i);
if (!page)
return NOPAGE_OOM;
get_page(page);
This page took
0.025028 seconds
and
5
git commands to generate.