aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-03-24 02:57:54 -0400
committerDave Airlie <airlied@linux.ie>2007-03-24 03:00:31 -0400
commit9e9c1326a592c677c94d730fcf4446d0e275aef4 (patch)
tree0341082ffe92b2354e79258b0f4ec6f7ee1153cf /drivers/char/drm
parent38315878a560eede1a2db52e511ad3a2cfbb4206 (diff)
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')
-rw-r--r--drivers/char/drm/drm_vm.c7
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)
633 vma->vm_page_prot = drm_io_prot(map->type, vma); 633 vma->vm_page_prot = drm_io_prot(map->type, vma);
634#ifdef __sparc__ 634#ifdef __sparc__
635 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); 635 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
636#endif
636 if (io_remap_pfn_range(vma, vma->vm_start, 637 if (io_remap_pfn_range(vma, vma->vm_start,
637 (map->offset + offset) >> PAGE_SHIFT, 638 (map->offset + offset) >> PAGE_SHIFT,
638 vma->vm_end - vma->vm_start, 639 vma->vm_end - vma->vm_start,
639 vma->vm_page_prot)) 640 vma->vm_page_prot))
640#else
641 if (io_remap_pfn_range(vma, vma->vm_start,
642 (map->offset + offset) >> PAGE_SHIFT,
643 vma->vm_end - vma->vm_start,
644 vma->vm_page_prot))
645#endif
646 return -EAGAIN; 641 return -EAGAIN;
647 DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," 642 DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx,"
648 " offset = 0x%lx\n", 643 " offset = 0x%lx\n",