Andrew Morton has already merged this patch.
Randy Dunlap: avoid warnings on sparc64
Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Ed L. Cashin <[email protected]>
diff -uprN a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoeblk.c 2005-03-07 17:37:14.000000000 -0500
+++ b/drivers/block/aoe/aoeblk.c 2005-03-10 12:20:00.000000000 -0500
@@ -28,7 +28,8 @@ static ssize_t aoedisk_show_mac(struct g
{
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)
{
@@ -241,7 +242,8 @@ aoeblk_gdalloc(void *vp)
aoedisk_add_sysfs(d);
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);
}
--
Ed L. Cashin <[email protected]>