summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-03-12 22:46:00 +0100
committerHelge Deller <deller@gmx.de>2015-04-24 13:45:54 +0200
commita4e4f67f41d9bfcc2a00849a75712f09a7d43798 (patch)
treed60de2e18f28af66c910e79a561e56c96d778248
parentMerge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit (diff)
downloadlinux-a4e4f67f41d9bfcc2a00849a75712f09a7d43798.tar.xz
linux-a4e4f67f41d9bfcc2a00849a75712f09a7d43798.zip
parisc: %pf is only for function pointers
Use %ps for actual addresses, otherwise you'll get bad output on arches like parisc64 where %pf expects a function descriptor. This wasn't normally seen on parisc64 because the code is not built unless DEBUG_SUPERIO_INIT is manually defined. Patch modified by Helge Deller to utilize KERN_DEBUG. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: linux-parisc@vger.kernel.org cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--drivers/parisc/superio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 8be2096c8423..deeaed544222 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)
BUG();
return -1;
}
- printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n",
+ printk(KERN_DEBUG "superio_fixup_irq(%s) ven 0x%x dev 0x%x from %ps\n",
pci_name(pcidev),
pcidev->vendor, pcidev->device,
__builtin_return_address(0));