git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' into max-sect
[pandora-kernel.git]
/
drivers
/
char
/
drm
/
drm_vm.c
diff --git
a/drivers/char/drm/drm_vm.c
b/drivers/char/drm/drm_vm.c
index
0291cd6
..
ffd0800
100644
(file)
--- a/
drivers/char/drm/drm_vm.c
+++ b/
drivers/char/drm/drm_vm.c
@@
-619,6
+619,7
@@
int drm_mmap(struct file *filp, struct vm_area_struct *vma)
#endif
offset = dev->driver->get_reg_ofs(dev);
#ifdef __sparc__
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
if (io_remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
(map->offset + offset) >> PAGE_SHIFT,
vma->vm_end - vma->vm_start,