Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9e9c1326a592c677c94d730fcf4446d0e275aef4
Commit: 9e9c1326a592c677c94d730fcf4446d0e275aef4
Parent: 38315878a560eede1a2db52e511ad3a2cfbb4206
Author: Dave Airlie <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 24 17:57:54 2007 +1100
Committer: Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Sat Mar 24 18:00:31 2007 +1100
drm: just use io_remap_pfn_range on all archs..
Move the sparc64 ifdef around to clean this up.
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
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 2d83b0b..35540cf 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",
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
