svn commit: r297199 - in head/sys: arm/at91 arm/cavium/cns11xx arm/mv arm/xscale/pxa dev/bhnd dev/bhnd/bhndb dev/gpio dev/iicbus dev/le dev/siba isa mips/atheros mips/beri mips/mips mips/rt305x pc9...
Justin Hibbits
jhibbits at FreeBSD.org
Tue Mar 22 22:25:13 UTC 2016
Author: jhibbits
Date: Tue Mar 22 22:25:08 2016
New Revision: 297199
URL: https://svnweb.freebsd.org/changeset/base/297199
Log:
Fix the resource_list_print_type() calls to use uintmax_t.
Missed a bunch from r297000.
Modified:
head/sys/arm/at91/at91.c
head/sys/arm/at91/at91_pinctrl.c
head/sys/arm/cavium/cns11xx/econa.c
head/sys/arm/mv/mv_localbus.c
head/sys/arm/xscale/pxa/pxa_obio.c
head/sys/arm/xscale/pxa/pxa_smi.c
head/sys/dev/bhnd/bhnd.c
head/sys/dev/bhnd/bhndb/bhndb.c
head/sys/dev/gpio/gpiobus.c
head/sys/dev/iicbus/iicbus.c
head/sys/dev/le/lebuffer_sbus.c
head/sys/dev/siba/siba.c
head/sys/isa/isa_common.c
head/sys/mips/atheros/apb.c
head/sys/mips/beri/beri_simplebus.c
head/sys/mips/mips/nexus.c
head/sys/mips/rt305x/obio.c
head/sys/pc98/pc98/canbus.c
head/sys/powerpc/powermac/macgpio.c
head/sys/powerpc/powermac/macio.c
head/sys/powerpc/powermac/uninorth.c
head/sys/powerpc/ps3/ps3bus.c
head/sys/powerpc/pseries/vdevice.c
head/sys/powerpc/psim/iobus.c
head/sys/sparc64/central/central.c
head/sys/sparc64/ebus/ebus.c
head/sys/sparc64/fhc/fhc.c
head/sys/sparc64/sbus/dma_sbus.c
head/sys/sparc64/sbus/sbus.c
head/sys/sparc64/sparc64/nexus.c
head/sys/sparc64/sparc64/upa.c
head/sys/x86/x86/nexus.c
Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/at91/at91.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -281,9 +281,9 @@ at91_print_child(device_t dev, device_t
retval += bus_print_child_header(dev, child);
- retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
if (device_get_flags(dev))
retval += printf(" flags %#x", device_get_flags(dev));
Modified: head/sys/arm/at91/at91_pinctrl.c
==============================================================================
--- head/sys/arm/at91/at91_pinctrl.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/at91/at91_pinctrl.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -330,8 +330,8 @@ pinctrl_print_res(struct pinctrl_devinfo
int rv;
rv = 0;
- rv += resource_list_print_type(&di->rl, "mem", SYS_RES_MEMORY, "%#lx");
- rv += resource_list_print_type(&di->rl, "irq", SYS_RES_IRQ, "%ld");
+ rv += resource_list_print_type(&di->rl, "mem", SYS_RES_MEMORY, "%#jx");
+ rv += resource_list_print_type(&di->rl, "irq", SYS_RES_IRQ, "%jd");
return (rv);
}
Modified: head/sys/arm/cavium/cns11xx/econa.c
==============================================================================
--- head/sys/arm/cavium/cns11xx/econa.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/cavium/cns11xx/econa.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -526,9 +526,9 @@ econa_print_child(device_t dev, device_t
retval += bus_print_child_header(dev, child);
- retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
if (device_get_flags(dev))
retval += printf(" flags %#x", device_get_flags(dev));
Modified: head/sys/arm/mv/mv_localbus.c
==============================================================================
--- head/sys/arm/mv/mv_localbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/mv/mv_localbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -323,8 +323,8 @@ localbus_print_child(device_t dev, devic
rv = 0;
rv += bus_print_child_header(dev, child);
- rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
rv += bus_print_child_footer(dev, child);
return (rv);
Modified: head/sys/arm/xscale/pxa/pxa_obio.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_obio.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/xscale/pxa/pxa_obio.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -159,9 +159,9 @@ pxa_print_child(device_t dev, device_t c
retval += bus_print_child_header(dev, child);
retval += resource_list_print_type(&od->od_resources, "at mem",
- SYS_RES_MEMORY, "0x%08lx");
+ SYS_RES_MEMORY, "0x%08jx");
retval += resource_list_print_type(&od->od_resources, "irq",
- SYS_RES_IRQ, "%ld");
+ SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
Modified: head/sys/arm/xscale/pxa/pxa_smi.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_smi.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/arm/xscale/pxa/pxa_smi.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -144,9 +144,9 @@ pxa_smi_print_child(device_t dev, device
retval += bus_print_child_header(dev, child);
retval += resource_list_print_type(&smid->smid_resources, "at mem",
- SYS_RES_MEMORY, "%#lx");
+ SYS_RES_MEMORY, "%#jx");
retval += resource_list_print_type(&smid->smid_resources, "irq",
- SYS_RES_IRQ, "%ld");
+ SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
Modified: head/sys/dev/bhnd/bhnd.c
==============================================================================
--- head/sys/dev/bhnd/bhnd.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/bhnd/bhnd.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -451,7 +451,7 @@ bhnd_generic_print_child(device_t dev, d
rl = BUS_GET_RESOURCE_LIST(dev, child);
if (rl != NULL) {
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
}
retval += printf(" at core %u", bhnd_get_core_index(child));
@@ -499,7 +499,7 @@ bhnd_generic_probe_nomatch(device_t dev,
rl = BUS_GET_RESOURCE_LIST(dev, child);
if (rl != NULL)
- resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
+ resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
printf(" at core %u (no driver attached)\n",
bhnd_get_core_index(child));
Modified: head/sys/dev/bhnd/bhndb/bhndb.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/bhnd/bhndb/bhndb.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -143,9 +143,9 @@ bhndb_print_child(device_t dev, device_t
rl = BUS_GET_RESOURCE_LIST(dev, child);
if (rl != NULL) {
retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
}
retval += bus_print_child_domain(dev, child);
Modified: head/sys/dev/gpio/gpiobus.c
==============================================================================
--- head/sys/dev/gpio/gpiobus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/gpio/gpiobus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -390,7 +390,7 @@ gpiobus_probe_nomatch(device_t dev, devi
device_printf(dev, "<unknown device> at pins %s", pins);
else
device_printf(dev, "<unknown device> at pin %s", pins);
- resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
+ resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
printf("\n");
}
@@ -412,7 +412,7 @@ gpiobus_print_child(device_t dev, device
gpiobus_print_pins(devi, pins, sizeof(pins));
retval += printf("%s", pins);
}
- resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
+ resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
return (retval);
Modified: head/sys/dev/iicbus/iicbus.c
==============================================================================
--- head/sys/dev/iicbus/iicbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/iicbus/iicbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -149,7 +149,7 @@ iicbus_print_child(device_t dev, device_
retval += bus_print_child_header(dev, child);
if (devi->addr != 0)
retval += printf(" at addr %#x", devi->addr);
- resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
+ resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
return (retval);
Modified: head/sys/dev/le/lebuffer_sbus.c
==============================================================================
--- head/sys/dev/le/lebuffer_sbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/le/lebuffer_sbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -297,7 +297,7 @@ lebuffer_print_res(struct lebuffer_devin
rv = 0;
rv += resource_list_print_type(&ldi->ldi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
- rv += resource_list_print_type(&ldi->ldi_rl, "irq", SYS_RES_IRQ, "%ld");
+ "%#jx");
+ rv += resource_list_print_type(&ldi->ldi_rl, "irq", SYS_RES_IRQ, "%jd");
return (rv);
}
Modified: head/sys/dev/siba/siba.c
==============================================================================
--- head/sys/dev/siba/siba.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/dev/siba/siba.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -597,8 +597,8 @@ siba_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return (retval);
}
Modified: head/sys/isa/isa_common.c
==============================================================================
--- head/sys/isa/isa_common.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/isa/isa_common.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -629,10 +629,10 @@ isa_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl) || device_get_flags(dev))
retval += printf(" at");
- retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
- retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
- retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld");
+ retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
+ retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
+ retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%jd");
if (device_get_flags(dev))
retval += printf(" flags %#x", device_get_flags(dev));
#ifdef ISAPNP
Modified: head/sys/mips/atheros/apb.c
==============================================================================
--- head/sys/mips/atheros/apb.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/mips/atheros/apb.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -491,8 +491,8 @@ apb_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return (retval);
}
Modified: head/sys/mips/beri/beri_simplebus.c
==============================================================================
--- head/sys/mips/beri/beri_simplebus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/mips/beri/beri_simplebus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -239,8 +239,8 @@ simplebus_print_child(device_t dev, devi
rv = 0;
rv += bus_print_child_header(dev, child);
- rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
if ((ip = simplebus_get_interrupt_parent(child)) != NULL)
rv += printf(" (%s)", device_get_nameunit(ip));
rv += bus_print_child_footer(dev, child);
Modified: head/sys/mips/mips/nexus.c
==============================================================================
--- head/sys/mips/mips/nexus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/mips/mips/nexus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -231,8 +231,8 @@ nexus_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return (retval);
}
Modified: head/sys/mips/rt305x/obio.c
==============================================================================
--- head/sys/mips/rt305x/obio.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/mips/rt305x/obio.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -587,8 +587,8 @@ obio_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return (retval);
}
Modified: head/sys/pc98/pc98/canbus.c
==============================================================================
--- head/sys/pc98/pc98/canbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/pc98/pc98/canbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -433,9 +433,9 @@ print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
- retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
+ retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return retval;
}
Modified: head/sys/powerpc/powermac/macgpio.c
==============================================================================
--- head/sys/powerpc/powermac/macgpio.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/powermac/macgpio.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -236,7 +236,7 @@ macgpio_print_child(device_t dev, device
printf(" addr 0x%02x", dinfo->gpio_num); /* should not happen */
resource_list_print_type(&dinfo->mdi_resources, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
retval += bus_print_child_footer(dev, child);
return (retval);
@@ -258,7 +258,7 @@ macgpio_probe_nomatch(device_t dev, devi
if (dinfo->gpio_num >= 0)
printf(" gpio %d",dinfo->gpio_num);
resource_list_print_type(&dinfo->mdi_resources, "irq",
- SYS_RES_IRQ, "%ld");
+ SYS_RES_IRQ, "%jd");
printf(" (no driver attached)\n");
}
}
Modified: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/powermac/macio.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -447,8 +447,8 @@ macio_print_child(device_t dev, device_t
retval += bus_print_child_header(dev, child);
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
@@ -470,8 +470,8 @@ macio_probe_nomatch(device_t dev, device
if ((type = ofw_bus_get_type(child)) == NULL)
type = "(unknown)";
device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child));
- resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
printf(" (no driver attached)\n");
}
}
Modified: head/sys/powerpc/powermac/uninorth.c
==============================================================================
--- head/sys/powerpc/powermac/uninorth.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/powermac/uninorth.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -425,8 +425,8 @@ unin_chip_print_child(device_t dev, devi
retval += bus_print_child_header(dev, child);
- retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
@@ -447,8 +447,8 @@ unin_chip_probe_nomatch(device_t dev, de
if ((type = ofw_bus_get_type(child)) == NULL)
type = "(unknown)";
device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child));
- resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
- resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+ resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
printf(" (no driver attached)\n");
}
}
Modified: head/sys/powerpc/ps3/ps3bus.c
==============================================================================
--- head/sys/powerpc/ps3/ps3bus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/ps3/ps3bus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -480,9 +480,9 @@ ps3bus_print_child(device_t dev, device_
retval += bus_print_child_header(dev, child);
retval += resource_list_print_type(&dinfo->resources, "mem",
- SYS_RES_MEMORY, "%#lx");
+ SYS_RES_MEMORY, "%#jx");
retval += resource_list_print_type(&dinfo->resources, "irq",
- SYS_RES_IRQ, "%ld");
+ SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
Modified: head/sys/powerpc/pseries/vdevice.c
==============================================================================
--- head/sys/powerpc/pseries/vdevice.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/pseries/vdevice.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -180,7 +180,7 @@ vdevice_print_child(device_t dev, device
retval += bus_print_child_header(dev, child);
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
Modified: head/sys/powerpc/psim/iobus.c
==============================================================================
--- head/sys/powerpc/psim/iobus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/powerpc/psim/iobus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -253,7 +253,7 @@ iobus_print_child(device_t dev, device_t
retval += bus_print_child_header(dev, child);
retval += printf(" offset 0x%x", dinfo->id_reg[1]);
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
retval += bus_print_child_footer(dev, child);
Modified: head/sys/sparc64/central/central.c
==============================================================================
--- head/sys/sparc64/central/central.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/central/central.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -295,5 +295,5 @@ central_print_res(struct central_devinfo
{
return (resource_list_print_type(&cdi->cdi_rl, "mem", SYS_RES_MEMORY,
- "%#lx"));
+ "%#jx"));
}
Modified: head/sys/sparc64/ebus/ebus.c
==============================================================================
--- head/sys/sparc64/ebus/ebus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/ebus/ebus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -721,8 +721,8 @@ ebus_print_res(struct ebus_devinfo *edi)
retval = 0;
retval += resource_list_print_type(&edi->edi_rl, "addr", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
retval += resource_list_print_type(&edi->edi_rl, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
return (retval);
}
Modified: head/sys/sparc64/fhc/fhc.c
==============================================================================
--- head/sys/sparc64/fhc/fhc.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/fhc/fhc.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -529,7 +529,7 @@ fhc_print_res(struct fhc_devinfo *fdi)
rv = 0;
rv += resource_list_print_type(&fdi->fdi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
- rv += resource_list_print_type(&fdi->fdi_rl, "irq", SYS_RES_IRQ, "%ld");
+ "%#jx");
+ rv += resource_list_print_type(&fdi->fdi_rl, "irq", SYS_RES_IRQ, "%jd");
return (rv);
}
Modified: head/sys/sparc64/sbus/dma_sbus.c
==============================================================================
--- head/sys/sparc64/sbus/dma_sbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/sbus/dma_sbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -409,7 +409,7 @@ dma_print_res(struct dma_devinfo *ddi)
rv = 0;
rv += resource_list_print_type(&ddi->ddi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
- rv += resource_list_print_type(&ddi->ddi_rl, "irq", SYS_RES_IRQ, "%ld");
+ "%#jx");
+ rv += resource_list_print_type(&ddi->ddi_rl, "irq", SYS_RES_IRQ, "%jd");
return (rv);
}
Modified: head/sys/sparc64/sbus/sbus.c
==============================================================================
--- head/sys/sparc64/sbus/sbus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/sbus/sbus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -929,8 +929,8 @@ sbus_print_res(struct sbus_devinfo *sdi)
rv = 0;
rv += resource_list_print_type(&sdi->sdi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
rv += resource_list_print_type(&sdi->sdi_rl, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
return (rv);
}
Modified: head/sys/sparc64/sparc64/nexus.c
==============================================================================
--- head/sys/sparc64/sparc64/nexus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/sparc64/nexus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -605,8 +605,8 @@ nexus_print_res(struct nexus_devinfo *nd
rv = 0;
rv += resource_list_print_type(&ndi->ndi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
rv += resource_list_print_type(&ndi->ndi_rl, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
return (rv);
}
Modified: head/sys/sparc64/sparc64/upa.c
==============================================================================
--- head/sys/sparc64/sparc64/upa.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/sparc64/sparc64/upa.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -588,8 +588,8 @@ upa_print_res(struct upa_devinfo *udi)
rv = 0;
rv += resource_list_print_type(&udi->udi_rl, "mem", SYS_RES_MEMORY,
- "%#lx");
+ "%#jx");
rv += resource_list_print_type(&udi->udi_rl, "irq", SYS_RES_IRQ,
- "%ld");
+ "%jd");
return (rv);
}
Modified: head/sys/x86/x86/nexus.c
==============================================================================
--- head/sys/x86/x86/nexus.c Tue Mar 22 22:07:14 2016 (r297198)
+++ head/sys/x86/x86/nexus.c Tue Mar 22 22:25:08 2016 (r297199)
@@ -301,9 +301,9 @@ nexus_print_all_resources(device_t dev)
if (STAILQ_FIRST(rl))
retval += printf(" at");
- retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
- retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
- retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+ retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#jx");
+ retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#jx");
+ retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%jd");
return retval;
}
More information about the svn-src-all
mailing list