diff options
Diffstat (limited to 'debian/patches/bugfix/m68k/zorro-resource_size_t-warnings.diff')
-rw-r--r-- | debian/patches/bugfix/m68k/zorro-resource_size_t-warnings.diff | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/bugfix/m68k/zorro-resource_size_t-warnings.diff b/debian/patches/bugfix/m68k/zorro-resource_size_t-warnings.diff new file mode 100644 index 000000000000..0bdc7d7987a7 --- /dev/null +++ b/debian/patches/bugfix/m68k/zorro-resource_size_t-warnings.diff @@ -0,0 +1,50 @@ +Subject: [PATCH] Amiga Zorro bus: kill resource_size_t warnings + +Kill resource_size_t warnings by casting resource_size_t to unsigned long when +formatting Zorro bus resources, as they are always 32-bit. + +Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> +--- + drivers/zorro/proc.c | 5 +++-- + drivers/zorro/zorro-sysfs.c | 3 ++- + drivers/zorro/zorro.c | 3 ++- + 3 files changed, 7 insertions(+), 4 deletions(-) + +--- linux-m68k-2.6.21.orig/drivers/zorro/proc.c ++++ linux-m68k-2.6.21/drivers/zorro/proc.c +@@ -90,8 +90,9 @@ get_zorro_dev_info(char *buf, char **sta + for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) { + struct zorro_dev *z = &zorro_autocon[slot]; + len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot, +- z->id, zorro_resource_start(z), +- zorro_resource_len(z), z->rom.er_Type); ++ z->id, (unsigned long)zorro_resource_start(z), ++ (unsigned long)zorro_resource_len(z), ++ z->rom.er_Type); + at += len; + if (at >= pos) { + if (!*start) { +--- linux-m68k-2.6.21.orig/drivers/zorro/zorro-sysfs.c ++++ linux-m68k-2.6.21/drivers/zorro/zorro-sysfs.c +@@ -42,7 +42,8 @@ static ssize_t zorro_show_resource(struc + struct zorro_dev *z = to_zorro_dev(dev); + + return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n", +- zorro_resource_start(z), zorro_resource_end(z), ++ (unsigned long)zorro_resource_start(z), ++ (unsigned long)zorro_resource_end(z), + zorro_resource_flags(z)); + } + +--- linux-m68k-2.6.21.orig/drivers/zorro/zorro.c ++++ linux-m68k-2.6.21/drivers/zorro/zorro.c +@@ -164,7 +164,8 @@ static int __init zorro_init(void) + if (request_resource(zorro_find_parent_resource(z), &z->resource)) + printk(KERN_ERR "Zorro: Address space collision on device %s " + "[%lx:%lx]\n", +- z->name, zorro_resource_start(z), zorro_resource_end(z)); ++ z->name, (unsigned long)zorro_resource_start(z), ++ (unsigned long)zorro_resource_end(z)); + sprintf(z->dev.bus_id, "%02x", i); + z->dev.parent = &zorro_bus.dev; + z->dev.bus = &zorro_bus_type; |