diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-03-24 07:57:54 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-03-24 08:00:31 +0100 |
| commit | 9e9c1326a592c677c94d730fcf4446d0e275aef4 (patch) | |
| tree | 0341082ffe92b2354e79258b0f4ec6f7ee1153cf /drivers/char/drm/drm_vm.c | |
| parent | drm: fix DRM_CONSISTENT mapping (diff) | |
| download | linux-9e9c1326a592c677c94d730fcf4446d0e275aef4.tar.xz linux-9e9c1326a592c677c94d730fcf4446d0e275aef4.zip | |
drm: just use io_remap_pfn_range on all archs..
Move the sparc64 ifdef around to clean this up.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_vm.c')
| -rw-r--r-- | drivers/char/drm/drm_vm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 2d83b0b3a514..35540cfb43dd 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c @@ -633,16 +633,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, vma->vm_end - vma->vm_start, vma->vm_page_prot)) -#else - if (io_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", |