diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2012-08-30 13:23:46 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-09-13 03:28:39 +0200 |
| commit | 93eb58d53fb14e9eeb1b42f8c04dbd7afc09adf7 (patch) | |
| tree | 810d07fd9b66ebe3b515ae7feee33263555cb4bf /drivers/gpu/drm/drm_vm.c | |
| parent | drm: use %*ph to dump small buffers (diff) | |
| download | linux-93eb58d53fb14e9eeb1b42f8c04dbd7afc09adf7.tar.xz linux-93eb58d53fb14e9eeb1b42f8c04dbd7afc09adf7.zip | |
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) offset = drm_core_get_reg_ofs(dev); vma->vm_flags |= VM_IO; /* not in core dump */ vma->vm_page_prot = drm_io_prot(map->type, vma); -#if !defined(__arm__) if (io_remap_pfn_range(vma, vma->vm_start, (map->offset + offset) >> PAGE_SHIFT, vma->vm_end - vma->vm_start, vma->vm_page_prot)) return -EAGAIN; -#else - if (remap_pfn_range(vma, vma->vm_start, - (map->offset + offset) >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) - return -EAGAIN; -#endif - DRM_DEBUG(" Type = %d; start = 0x%lx, end = 0x%lx," " offset = 0x%llx\n", map->type, |