evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uio: Pass pointers to virt_to_page(), not integers

Browse source 
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: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Hutchings 2013-10-27 21:53:40 +00:00 • committed by Greg Kroah-Hartman
parent 75f0aef622
commit e6418fcc8a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/uio/uio.c
View file

@ -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 uio_device *idev = vma->vm_private_data;
struct page *page; struct page *page;
unsigned long offset; unsigned long offset;
void *addr;
int mi = uio_find_mem_index(vma); int mi = uio_find_mem_index(vma);
if (mi < 0) 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; 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) 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 else
page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset); page = vmalloc_to_page(addr);
get_page(page); get_page(page);
vmf->page = page; vmf->page = page;
return 0; return 0;