Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6418fcc authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

uio: Pass pointers to virt_to_page(), not integers 



Most architectures define virt_to_page() as a macro that casts its
argument such that an argument of type unsigned long will be accepted
without complaint.  However, the proper type is void *, and passing
unsigned long results in a warning on MIPS.

Compile-tested only.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75f0aef6

drivers/uio/uio.c

+4 −2
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	struct uio_device *idev = vma->vm_private_data;

	struct page *page;

	unsigned long offset;

	void *addr;



	int mi = uio_find_mem_index(vma);

	if (mi < 0)
@@ -616,10 +617,11 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 */

	offset = (vmf->pgoff - mi) << PAGE_SHIFT;



	addr = (void *)(unsigned long)idev->info->mem[mi].addr + offset;

	if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)

		page = virt_to_page(idev->info->mem[mi].addr + offset);

		page = virt_to_page(addr);

	else

		page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset);

		page = vmalloc_to_page(addr);

	get_page(page);

	vmf->page = page;

	return 0;