]> err.no Git - linux-2.6/commitdiff
drm: just use io_remap_pfn_range on all archs..
authorDave Airlie <airlied@linux.ie>
Sat, 24 Mar 2007 06:57:54 +0000 (17:57 +1100)
committerDave Airlie <airlied@linux.ie>
Sat, 24 Mar 2007 07:00:31 +0000 (18:00 +1100)
Move the sparc64 ifdef around to clean this up.

Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drm_vm.c

index 2d83b0b3a514d41ef32e02763f9a587a6d22dfb6..35540cfb43dd0fecf5d3b8fac30cbea2236796ff 100644 (file)
@@ -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",