drm: Remove unnecessary test for ARM. (93eb58d5) · Commits · 戴 / test

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>

drivers/gpu/drm/drm_vm.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -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,

Admin message