diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 19:56:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 19:56:57 +0100 |
| commit | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (patch) | |
| tree | 837da034751a2fc1be0fc5a105c218d41a498eb6 /drivers/char | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SPARC64]: Add a secondary TSB for hugepage mappings. (diff) | |
| download | linux-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.tar.xz linux-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add a secondary TSB for hugepage mappings.
[SPARC]: Respect vm_page_prot in io_remap_page_range().
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/drm/drm_vm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 0291cd62c69f..ffd0800ed601 100644 --- 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, |