aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-06-15 18:05:07 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-10-16 08:09:45 -0400
commit50564a794d64ace92c189d7cb5b591a60d3de9c2 (patch)
tree9098be04407b206b1b5d1280ebb4e964e0e16026 /arch/arm/mach-integrator
parenta67202583f44c90d1155f4de8c8028884a2a1451 (diff)
ARM: integrator: print the Linux IRQ in LL_DEBUG code
The static HW irqs have no meaning in the interrupt handler and does not correlate to the /proc/interrupts IRQ numbers anymore, print the Linux IRQ number instead. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/pci_v3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index bef100527c42..2d10793fa2a0 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -605,7 +605,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
605 return 1; 605 return 1;
606} 606}
607 607
608static irqreturn_t v3_irq(int dummy, void *devid) 608static irqreturn_t v3_irq(int irq, void *devid)
609{ 609{
610#ifdef CONFIG_DEBUG_LL 610#ifdef CONFIG_DEBUG_LL
611 struct pt_regs *regs = get_irq_regs(); 611 struct pt_regs *regs = get_irq_regs();
@@ -615,7 +615,7 @@ static irqreturn_t v3_irq(int dummy, void *devid)
615 extern void printascii(const char *); 615 extern void printascii(const char *);
616 616
617 sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " 617 sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x "
618 "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, 618 "ISTAT=%02x\n", irq, pc, instr,
619 __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFADDR_OFFSET), 619 __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFADDR_OFFSET),
620 __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFCODE_OFFSET) & 255, 620 __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFCODE_OFFSET) & 255,
621 v3_readb(V3_LB_ISTAT)); 621 v3_readb(V3_LB_ISTAT));