diff options
Diffstat (limited to 'arch/blackfin/mach-common/ints-priority.c')
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index eaece5f84e42..da7e3c63746b 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
@@ -511,7 +511,7 @@ static void bfin_demux_mac_status_irq(unsigned int int_err_irq, | |||
511 | int i, irq = 0; | 511 | int i, irq = 0; |
512 | u32 status = bfin_read_EMAC_SYSTAT(); | 512 | u32 status = bfin_read_EMAC_SYSTAT(); |
513 | 513 | ||
514 | for (i = 0; i < (IRQ_MAC_STMDONE - IRQ_MAC_PHYINT); i++) | 514 | for (i = 0; i <= (IRQ_MAC_STMDONE - IRQ_MAC_PHYINT); i++) |
515 | if (status & (1L << i)) { | 515 | if (status & (1L << i)) { |
516 | irq = IRQ_MAC_PHYINT + i; | 516 | irq = IRQ_MAC_PHYINT + i; |
517 | break; | 517 | break; |
@@ -529,8 +529,9 @@ static void bfin_demux_mac_status_irq(unsigned int int_err_irq, | |||
529 | } else | 529 | } else |
530 | printk(KERN_ERR | 530 | printk(KERN_ERR |
531 | "%s : %s : LINE %d :\nIRQ ?: MAC ERROR" | 531 | "%s : %s : LINE %d :\nIRQ ?: MAC ERROR" |
532 | " INTERRUPT ASSERTED BUT NO SOURCE FOUND\n", | 532 | " INTERRUPT ASSERTED BUT NO SOURCE FOUND" |
533 | __func__, __FILE__, __LINE__); | 533 | "(EMAC_SYSTAT=0x%X)\n", |
534 | __func__, __FILE__, __LINE__, status); | ||
534 | } | 535 | } |
535 | #endif | 536 | #endif |
536 | 537 | ||
@@ -1298,7 +1299,7 @@ void do_irq(int vec, struct pt_regs *fp) | |||
1298 | } else { | 1299 | } else { |
1299 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; | 1300 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; |
1300 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; | 1301 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; |
1301 | #if defined(SIC_ISR0) || defined(SICA_ISR0) | 1302 | #if defined(SIC_ISR0) |
1302 | unsigned long sic_status[3]; | 1303 | unsigned long sic_status[3]; |
1303 | 1304 | ||
1304 | if (smp_processor_id()) { | 1305 | if (smp_processor_id()) { |
@@ -1378,7 +1379,7 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) | |||
1378 | if (likely(vec == EVT_IVTMR_P)) | 1379 | if (likely(vec == EVT_IVTMR_P)) |
1379 | irq = IRQ_CORETMR; | 1380 | irq = IRQ_CORETMR; |
1380 | else { | 1381 | else { |
1381 | #if defined(SIC_ISR0) || defined(SICA_ISR0) | 1382 | #if defined(SIC_ISR0) |
1382 | unsigned long sic_status[3]; | 1383 | unsigned long sic_status[3]; |
1383 | 1384 | ||
1384 | sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0(); | 1385 | sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0(); |