diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
| commit | cd4c82176f3f429e722ca3fac2abf231af479780 (patch) | |
| tree | 6c658f8ea8cbfcdbb5d3c8518a5f13ca90b465e3 /linux-core/drm_vm.c | |
| parent | 5d69640a6ad15522fa37c3b232eb34acef955892 (diff) | |
| parent | 3f70518f0bcf36a1e2c82db962324dbdee106f67 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'linux-core/drm_vm.c')
| -rw-r--r-- | linux-core/drm_vm.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c index 775ca878..54a0849f 100644 --- a/linux-core/drm_vm.c +++ b/linux-core/drm_vm.c @@ -596,13 +596,12 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) ) return drm_mmap_dma(filp, vma); - if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff , &hash)) { + if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash)) { DRM_ERROR("Could not find map\n"); return -EINVAL; } - map = drm_hash_entry(hash,drm_map_list_t, hash)->map; - + map = drm_hash_entry(hash, drm_map_list_t, hash)->map; if (!map || ((map->flags & _DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN))) return -EPERM; @@ -647,16 +646,11 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) vma->vm_page_prot = drm_io_prot(map->type, vma); #ifdef __sparc__ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +#endif if (io_remap_pfn_range(vma, vma->vm_start, - (map->offset + offset) >>PAGE_SHIFT, + (map->offset + offset) >> PAGE_SHIFT, vma->vm_end - vma->vm_start, vma->vm_page_prot)) -#else - if (remap_pfn_range(vma, vma->vm_start, - (map->offset + offset) >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) -#endif return -EAGAIN; DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," " offset = 0x%lx\n", |