| Message ID | 1465480746-23914-1-git-send-email-julien.grall@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 9 Jun 2016, Julien Grall wrote: > Commit "xen/arm: gicv2: Export GICv2m register frames to DOM0 by device > tree" breaks compilation on ARM32. > > This is because paddr_t field are printed using %lx. Fix it by using > PRIpaddr which will provide the correct modifiers. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Hi Julien, thanks for the patch. I'll just commit it on top. > Stefano, the patch "xen/arm: gicv2: Export GICv2m register..." is > still in your branch next-4.8. Do you plan to rebase before merging > the branch? If not, I will add the commit ID in the message. > > I would also be fine if you decide to fold this patch into the patch > that introduced the build issue. > --- > xen/arch/arm/gic-v2.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c > index afeab57..2c1c0ba 100644 > --- a/xen/arch/arm/gic-v2.c > +++ b/xen/arch/arm/gic-v2.c > @@ -597,7 +597,7 @@ static int gicv2_map_hwdown_extra_mappings(struct domain *d) > int ret; > u32 spi; > > - printk("GICv2: Mapping v2m frame to d%d: addr=0x%lx size=0x%lx spi_base=%u num_spis=%u\n", > + printk("GICv2: Mapping v2m frame to d%d: addr=0x%"PRIpaddr" size=0x%"PRIpaddr" spi_base=%u num_spis=%u\n", > d->domain_id, v2m_data->addr, v2m_data->size, > v2m_data->spi_start, v2m_data->nr_spis); > > @@ -685,7 +685,7 @@ static int gicv2m_make_dt_node(const struct domain *d, > { > v2m = v2m_data->dt_node; > > - printk("GICv2: Creating v2m DT node for d%d: addr=0x%lx size=0x%lx spi_base=%u num_spis=%u\n", > + printk("GICv2: Creating v2m DT node for d%d: addr=0x%"PRIpaddr" size=0x%"PRIpaddr" spi_base=%u num_spis=%u\n", > d->domain_id, v2m_data->addr, v2m_data->size, > v2m_data->spi_start, v2m_data->nr_spis); > > -- > 1.9.1 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel >
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index afeab57..2c1c0ba 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -597,7 +597,7 @@ static int gicv2_map_hwdown_extra_mappings(struct domain *d) int ret; u32 spi; - printk("GICv2: Mapping v2m frame to d%d: addr=0x%lx size=0x%lx spi_base=%u num_spis=%u\n", + printk("GICv2: Mapping v2m frame to d%d: addr=0x%"PRIpaddr" size=0x%"PRIpaddr" spi_base=%u num_spis=%u\n", d->domain_id, v2m_data->addr, v2m_data->size, v2m_data->spi_start, v2m_data->nr_spis); @@ -685,7 +685,7 @@ static int gicv2m_make_dt_node(const struct domain *d, { v2m = v2m_data->dt_node; - printk("GICv2: Creating v2m DT node for d%d: addr=0x%lx size=0x%lx spi_base=%u num_spis=%u\n", + printk("GICv2: Creating v2m DT node for d%d: addr=0x%"PRIpaddr" size=0x%"PRIpaddr" spi_base=%u num_spis=%u\n", d->domain_id, v2m_data->addr, v2m_data->size, v2m_data->spi_start, v2m_data->nr_spis);
Commit "xen/arm: gicv2: Export GICv2m register frames to DOM0 by device tree" breaks compilation on ARM32. This is because paddr_t field are printed using %lx. Fix it by using PRIpaddr which will provide the correct modifiers. Signed-off-by: Julien Grall <julien.grall@arm.com> --- Stefano, the patch "xen/arm: gicv2: Export GICv2m register..." is still in your branch next-4.8. Do you plan to rebase before merging the branch? If not, I will add the commit ID in the message. I would also be fine if you decide to fold this patch into the patch that introduced the build issue. --- xen/arch/arm/gic-v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)