1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index c89f12a8b116..a783d533a1a6 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -69,7 +69,7 @@ static ssize_t map_name_show(struct uio_mem *mem, char *buf)
 
 static ssize_t map_addr_show(struct uio_mem *mem, char *buf)
 {
-        return sprintf(buf, "0x%lx\n", mem->addr);
+        return sprintf(buf, "0x%llx\n", (unsigned long long)mem->addr);
 }
 
 static ssize_t map_size_show(struct uio_mem *mem, char *buf)
@@ -79,7 +79,7 @@ static ssize_t map_size_show(struct uio_mem *mem, char *buf)
 
 static ssize_t map_offset_show(struct uio_mem *mem, char *buf)
 {
-        return sprintf(buf, "0x%lx\n", mem->addr & ~PAGE_MASK);
+        return sprintf(buf, "0x%llx\n", (unsigned long long)mem->addr & ~PAGE_MASK);
 }
 
 struct map_sysfs_entry {
@@ -634,8 +634,7 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
                 page = virt_to_page(idev->info->mem[mi].addr + offset);
         else
-                page = vmalloc_to_page((void *)idev->info->mem[mi].addr
-                                                        + offset);
+                page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset);
         get_page(page);
         vmf->page = page;
         return 0;