diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2012-08-30 07:23:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-09-12 21:28:39 -0400 |
commit | 93eb58d53fb14e9eeb1b42f8c04dbd7afc09adf7 (patch) | |
tree | 810d07fd9b66ebe3b515ae7feee33263555cb4bf /drivers/gpu/drm/drm_vm.c | |
parent | 9a6a4b4757175271bc3a289fcb5c69e897039379 (diff) |
drm: Remove unnecessary test for ARM.
Since arch/arm/include/asm/pgtable.h contains:
#define io_remap_pfn_range(vma,from,pfn,size,prot) \
remap_pfn_range(vma, from, pfn, size, prot)
there is no point treating ARM as a special case in distinguishing
between remap_pfn_range() and io_remap_pfn_range().
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
-rw-r--r-- | drivers/gpu/drm/drm_vm.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 3f0616672531..6fed21502313 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
@@ -619,20 +619,11 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) | |||
619 | offset = drm_core_get_reg_ofs(dev); | 619 | offset = drm_core_get_reg_ofs(dev); |
620 | vma->vm_flags |= VM_IO; /* not in core dump */ | 620 | vma->vm_flags |= VM_IO; /* not in core dump */ |
621 | vma->vm_page_prot = drm_io_prot(map->type, vma); | 621 | vma->vm_page_prot = drm_io_prot(map->type, vma); |
622 | #if !defined(__arm__) | ||
623 | if (io_remap_pfn_range(vma, vma->vm_start, | 622 | if (io_remap_pfn_range(vma, vma->vm_start, |
624 | (map->offset + offset) >> PAGE_SHIFT, | 623 | (map->offset + offset) >> PAGE_SHIFT, |
625 | vma->vm_end - vma->vm_start, | 624 | vma->vm_end - vma->vm_start, |
626 | vma->vm_page_prot)) | 625 | vma->vm_page_prot)) |
627 | return -EAGAIN; | 626 | return -EAGAIN; |
628 | #else | ||
629 | if (remap_pfn_range(vma, vma->vm_start, | ||
630 | (map->offset + offset) >> PAGE_SHIFT, | ||
631 | vma->vm_end - vma->vm_start, | ||
632 | vma->vm_page_prot)) | ||
633 | return -EAGAIN; | ||
634 | #endif | ||
635 | |||
636 | DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," | 627 | DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," |
637 | " offset = 0x%llx\n", | 628 | " offset = 0x%llx\n", |
638 | map->type, | 629 | map->type, |