Merge tag 'lsk-v3.10-15.04-android'

[firefly-linux-kernel-4.4.55.git] / block / partitions / rk.c

diff --git a/block/partitions/rk.c b/block/partitions/rk.c
index 93cb0d6d4b6067a6d18a620deee59807436121a9..0a20ababa44ba2683193df78740bdaf774a02c21 100755 (executable)
--- a/block/partitions/rk.c
+++ b/block/partitions/rk.c
@@ -45,7 +45,7 @@ static struct rk_partition *newpart(char *s,
                /* No sense support partition less than 8B */
                if (size < ((PAGE_SIZE) >> 9))
                {
-                       printk(KERN_ERR ERRP "partition size too small (%llx)\n", size);
+                       printk(KERN_ERR ERRP "partition size too small (%llx)\n", (u64)size);
                        return NULL;
                }
        }
@@ -320,9 +320,9 @@ int rkpart_partition(struct parsed_partitions *state)
                strcpy(state->parts[i+1].info.volname, parts[i].name);
                 printk(KERN_INFO "%10s: 0x%09llx -- 0x%09llx (%llu MB)\n", 
                                parts[i].name,
-                               parts[i].from * 512,
-                               (parts[i].from + parts[i].size) * 512,
-                               parts[i].size / 2048);
+                               (u64)parts[i].from * 512,
+                               (u64)(parts[i].from + parts[i].size) * 512,
+                               (u64)parts[i].size / 2048);
        }
 
        rkpart_bootmode_fixup();