1 files changed, 11 insertions, 8 deletions

diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index b42150190d0e..6ffda78aaf9d 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -967,7 +967,7 @@ void __cpuinit init_exception_vectors(void)
         bfin_write_EVT11(evt_evt11);
         bfin_write_EVT12(evt_evt12);
         bfin_write_EVT13(evt_evt13);
-        bfin_write_EVT14(evt14_softirq);
+        bfin_write_EVT14(evt_evt14);
         bfin_write_EVT15(evt_system_call);
         CSYNC();
 }
@@ -1052,18 +1052,26 @@ int __init init_arch_irq(void)
                         set_irq_chained_handler(irq, bfin_demux_error_irq);
                         break;
 #endif
+
 #ifdef CONFIG_SMP
+#ifdef CONFIG_TICKSOURCE_GPTMR0
+                case IRQ_TIMER0:
+#endif
+#ifdef CONFIG_TICKSOURCE_CORETMR
+                case IRQ_CORETMR:
+#endif
                 case IRQ_SUPPLE_0:
                 case IRQ_SUPPLE_1:
                         set_irq_handler(irq, handle_percpu_irq);
                         break;
 #endif
+
 #ifdef CONFIG_IPIPE
 #ifndef CONFIG_TICKSOURCE_CORETMR
                 case IRQ_TIMER0:
                         set_irq_handler(irq, handle_simple_irq);
                         break;
-#endif /* !CONFIG_TICKSOURCE_CORETMR */
+#endif
                 case IRQ_CORETMR:
                         set_irq_handler(irq, handle_simple_irq);
                         break;
@@ -1071,15 +1079,10 @@ int __init init_arch_irq(void)
                         set_irq_handler(irq, handle_level_irq);
                         break;
 #else /* !CONFIG_IPIPE */
-#ifdef CONFIG_TICKSOURCE_GPTMR0
-                case IRQ_TIMER0:
-                        set_irq_handler(irq, handle_percpu_irq);
-                        break;
-#endif /* CONFIG_TICKSOURCE_GPTMR0 */
                 default:
                         set_irq_handler(irq, handle_simple_irq);
                         break;
-#endif  /* !CONFIG_IPIPE */
+#endif /* !CONFIG_IPIPE */
                 }
         }