Commit 0560b158 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] aoe: fix printk warning

u64's are not longlongs on sparc64 and ppc64.
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ba15d6aa
...@@ -28,7 +28,8 @@ static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page) ...@@ -28,7 +28,8 @@ static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
{ {
struct aoedev *d = disk->private_data; struct aoedev *d = disk->private_data;
return snprintf(page, PAGE_SIZE, "%012llx\n", mac_addr(d->addr)); return snprintf(page, PAGE_SIZE, "%012llx\n",
(unsigned long long)mac_addr(d->addr));
} }
static ssize_t aoedisk_show_netif(struct gendisk * disk, char *page) static ssize_t aoedisk_show_netif(struct gendisk * disk, char *page)
{ {
...@@ -241,7 +242,8 @@ aoeblk_gdalloc(void *vp) ...@@ -241,7 +242,8 @@ aoeblk_gdalloc(void *vp)
aoedisk_add_sysfs(d); aoedisk_add_sysfs(d);
printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu " printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu "
"sectors\n", mac_addr(d->addr), d->aoemajor, d->aoeminor, "sectors\n", (unsigned long long)mac_addr(d->addr),
d->aoemajor, d->aoeminor,
d->fw_ver, (long long)d->ssize); d->fw_ver, (long long)d->ssize);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment