Message ID | 1466747662-9868-1-git-send-email-andrew.donnellan@au1.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Fri, Jun 24, 2016 at 03:54:22PM +1000, Andrew Donnellan wrote: >eeh_cache.c doesn't build cleanly with -DDEBUG when >CONFIG_PHYS_ADDR_T_64BIT is set, as a couple of pr_debug()s use "%lx" for >resource_size_t parameters. > >Use "%pap" instead, as it's the correct format specifier for types deriving >from phys_addr_t. > >Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >Cc: Russell Currey <ruscur@russell.cc> >Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >--- > arch/powerpc/kernel/eeh_cache.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c >index ddbcfab..ceb81a4 100644 >--- a/arch/powerpc/kernel/eeh_cache.c >+++ b/arch/powerpc/kernel/eeh_cache.c >@@ -114,9 +114,9 @@ static void eeh_addr_cache_print(struct pci_io_addr_cache *cache) > while (n) { > struct pci_io_addr_range *piar; > piar = rb_entry(n, struct pci_io_addr_range, rb_node); >- pr_debug("PCI: %s addr range %d [%lx-%lx]: %s\n", >+ pr_debug("PCI: %s addr range %d [%pap-%pap]: %s\n", > (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt, >- piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev)); >+ &piar->addr_lo, &piar->addr_hi, pci_name(piar->pcidev)); > cnt++; > n = rb_next(n); > } >@@ -159,8 +159,8 @@ eeh_addr_cache_insert(struct pci_dev *dev, resource_size_t alo, > piar->flags = flags; > > #ifdef DEBUG >- pr_debug("PIAR: insert range=[%lx:%lx] dev=%s\n", >- alo, ahi, pci_name(dev)); >+ pr_debug("PIAR: insert range=[%pap:%pap] dev=%s\n", >+ &alo, &ahi, pci_name(dev)); > #endif > > rb_link_node(&piar->rb_node, parent, p); >-- >Andrew Donnellan OzLabs, ADL Canberra >andrew.donnellan@au1.ibm.com IBM Australia Limited >
On Fri, 2016-24-06 at 05:54:22 UTC, Andrew Donnellan wrote: > eeh_cache.c doesn't build cleanly with -DDEBUG when > CONFIG_PHYS_ADDR_T_64BIT is set, as a couple of pr_debug()s use "%lx" for > resource_size_t parameters. > > Use "%pap" instead, as it's the correct format specifier for types deriving > from phys_addr_t. > > Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > Cc: Russell Currey <ruscur@russell.cc> > Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> > Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/91dc068202a61741a458232de7 cheers
diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c index ddbcfab..ceb81a4 100644 --- a/arch/powerpc/kernel/eeh_cache.c +++ b/arch/powerpc/kernel/eeh_cache.c @@ -114,9 +114,9 @@ static void eeh_addr_cache_print(struct pci_io_addr_cache *cache) while (n) { struct pci_io_addr_range *piar; piar = rb_entry(n, struct pci_io_addr_range, rb_node); - pr_debug("PCI: %s addr range %d [%lx-%lx]: %s\n", + pr_debug("PCI: %s addr range %d [%pap-%pap]: %s\n", (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt, - piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev)); + &piar->addr_lo, &piar->addr_hi, pci_name(piar->pcidev)); cnt++; n = rb_next(n); } @@ -159,8 +159,8 @@ eeh_addr_cache_insert(struct pci_dev *dev, resource_size_t alo, piar->flags = flags; #ifdef DEBUG - pr_debug("PIAR: insert range=[%lx:%lx] dev=%s\n", - alo, ahi, pci_name(dev)); + pr_debug("PIAR: insert range=[%pap:%pap] dev=%s\n", + &alo, &ahi, pci_name(dev)); #endif rb_link_node(&piar->rb_node, parent, p);
eeh_cache.c doesn't build cleanly with -DDEBUG when CONFIG_PHYS_ADDR_T_64BIT is set, as a couple of pr_debug()s use "%lx" for resource_size_t parameters. Use "%pap" instead, as it's the correct format specifier for types deriving from phys_addr_t. Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Cc: Russell Currey <ruscur@russell.cc> Cc: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/kernel/eeh_cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)