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: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index c8e45add506e8db90ef8c8baa72dbc8947ea55d2..e221f13fcb614eeeb979d0da04acc4fd8cf74ea2 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -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;