From 6688c6a4adab16c560006e3b8d5e1cbb0a641757 Mon Sep 17 00:00:00 2001
From: Kai Jiang <Kai.Jiang@freescale.com>
Date: Mon, 17 Oct 2011 20:50:20 +0200
Subject: [PATCH] --- yaml --- r: 264879 b: refs/heads/master c:
 27a90700a4275c5178b883b65927affdafa5185c h: refs/heads/master i:   264877:
 b6cabcf46b68f6a58313a5e50b450b7384840396   264875:
 fdffaeee6a79b4b68f4ec0aaf0a251d190d404f9   264871:
 9481a5d6e1579f47d8732cd9f09c3be29bcc3924   264863:
 16b6b6680d276ccd1c75a35d04826d480be897d2 v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/DocBook/uio-howto.tmpl | 2 +-
 trunk/drivers/uio/uio.c                    | 7 +++----
 trunk/include/linux/uio_driver.h           | 7 +++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a09093231876..f823f46ca8c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4253cb0748cd50060d04d838c38b07f1ad0e6e5
+refs/heads/master: 27a90700a4275c5178b883b65927affdafa5185c
diff --git a/trunk/Documentation/DocBook/uio-howto.tmpl b/trunk/Documentation/DocBook/uio-howto.tmpl
index 7c4b514d62b1..54883de5d5f9 100644
--- a/trunk/Documentation/DocBook/uio-howto.tmpl
+++ b/trunk/Documentation/DocBook/uio-howto.tmpl
@@ -529,7 +529,7 @@ memory (e.g. allocated with <function>kmalloc()</function>). There's also
 </para></listitem>
 
 <listitem><para>
-<varname>unsigned long addr</varname>: Required if the mapping is used.
+<varname>phys_addr_t addr</varname>: Required if the mapping is used.
 Fill in the address of your memory block. This address is the one that
 appears in sysfs.
 </para></listitem>
diff --git a/trunk/drivers/uio/uio.c b/trunk/drivers/uio/uio.c
index c89f12a8b116..a783d533a1a6 100644
--- a/trunk/drivers/uio/uio.c
+++ b/trunk/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;
diff --git a/trunk/include/linux/uio_driver.h b/trunk/include/linux/uio_driver.h
index 665517c05eaf..fd99ff9298c6 100644
--- a/trunk/include/linux/uio_driver.h
+++ b/trunk/include/linux/uio_driver.h
@@ -23,7 +23,10 @@ struct uio_map;
 /**
  * struct uio_mem - description of a UIO memory region
  * @name:		name of the memory region for identification
- * @addr:		address of the device's memory
+ * @addr:		address of the device's memory (phys_addr is used since
+ * 			addr can be logical, virtual, or physical & phys_addr_t
+ * 			should always be large enough to handle any of the
+ * 			address types)
  * @size:		size of IO
  * @memtype:		type of memory addr points to
  * @internal_addr:	ioremap-ped version of addr, for driver internal use
@@ -31,7 +34,7 @@ struct uio_map;
  */
 struct uio_mem {
 	const char		*name;
-	unsigned long		addr;
+	phys_addr_t		addr;
 	unsigned long		size;
 	int			memtype;
 	void __iomem		*internal_addr;