Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / android / ion / rockchip / rockchip_ion_snapshot.c

diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
index e163032d931ca48c782e9ca410bdee677b46d829..4814b42cde0443f8180a84ef22152acbb4e9de4d 100755 (executable)
--- a/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
@@ -68,7 +68,7 @@ static const struct file_operations ion_snapshot_fops = {
        .read = ion_snapshot_read,
 };
 
-char *rockchip_ion_snapshot_get(unsigned *size)
+char *rockchip_ion_snapshot_get(size_t *size)
 {
        *size = LOG_BUF_LEN;
        return ion_snapshot_buf;
@@ -127,12 +127,14 @@ static int __init rockchip_ion_snapshot_init(void)
 
        ion_snapshot_buf = last_ion_vmap(virt_to_phys(log_buf), 1 << LOG_BUF_PAGE_ORDER);
        if (!ion_snapshot_buf) {
-               pr_err("failed to map %d pages at 0x%08x\n", 1 << LOG_BUF_PAGE_ORDER, virt_to_phys(log_buf));
+               pr_err("failed to map %d pages at 0x%lx\n", 1 << LOG_BUF_PAGE_ORDER,
+                       (unsigned long)virt_to_phys(log_buf));
                return 0;
        }
 
-       pr_info("0x%08x map to 0x%p and copy to 0x%p (version 0.1)\n", 
-                       virt_to_phys(log_buf), ion_snapshot_buf, last_ion_buf);
+       pr_info("0x%lx map to 0x%p and copy to 0x%p (version 0.1)\n", 
+                       (unsigned long)virt_to_phys(log_buf), ion_snapshot_buf,
+                       last_ion_buf);
 
        memcpy(last_ion_buf, ion_snapshot_buf, LOG_BUF_LEN);
        memset(ion_snapshot_buf, 0, LOG_BUF_LEN);