diff options
Diffstat (limited to 'arch/blackfin/mach-common')
-rw-r--r-- | arch/blackfin/mach-common/entry.S | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 4c07fcb356a2..919f7aef0773 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -975,10 +975,10 @@ ENTRY(_lower_to_irq14) | |||
975 | #endif | 975 | #endif |
976 | 976 | ||
977 | #ifdef CONFIG_DEBUG_HWERR | 977 | #ifdef CONFIG_DEBUG_HWERR |
978 | /* enable irq14 & hwerr interrupt, until we transition to _evt14_softirq */ | 978 | /* enable irq14 & hwerr interrupt, until we transition to _evt_evt14 */ |
979 | r0 = (EVT_IVG14 | EVT_IVHW | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); | 979 | r0 = (EVT_IVG14 | EVT_IVHW | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); |
980 | #else | 980 | #else |
981 | /* Only enable irq14 interrupt, until we transition to _evt14_softirq */ | 981 | /* Only enable irq14 interrupt, until we transition to _evt_evt14 */ |
982 | r0 = (EVT_IVG14 | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); | 982 | r0 = (EVT_IVG14 | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); |
983 | #endif | 983 | #endif |
984 | sti r0; | 984 | sti r0; |
@@ -986,7 +986,7 @@ ENTRY(_lower_to_irq14) | |||
986 | rti; | 986 | rti; |
987 | ENDPROC(_lower_to_irq14) | 987 | ENDPROC(_lower_to_irq14) |
988 | 988 | ||
989 | ENTRY(_evt14_softirq) | 989 | ENTRY(_evt_evt14) |
990 | #ifdef CONFIG_DEBUG_HWERR | 990 | #ifdef CONFIG_DEBUG_HWERR |
991 | r0 = (EVT_IVHW | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); | 991 | r0 = (EVT_IVHW | EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU); |
992 | sti r0; | 992 | sti r0; |
@@ -996,7 +996,7 @@ ENTRY(_evt14_softirq) | |||
996 | [--sp] = RETI; | 996 | [--sp] = RETI; |
997 | SP += 4; | 997 | SP += 4; |
998 | rts; | 998 | rts; |
999 | ENDPROC(_evt14_softirq) | 999 | ENDPROC(_evt_evt14) |
1000 | 1000 | ||
1001 | ENTRY(_schedule_and_signal_from_int) | 1001 | ENTRY(_schedule_and_signal_from_int) |
1002 | /* To end up here, vector 15 was changed - so we have to change it | 1002 | /* To end up here, vector 15 was changed - so we have to change it |
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index b42150190d0e..4cc55bc41426 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) | |||
967 | bfin_write_EVT11(evt_evt11); | 967 | bfin_write_EVT11(evt_evt11); |
968 | bfin_write_EVT12(evt_evt12); | 968 | bfin_write_EVT12(evt_evt12); |
969 | bfin_write_EVT13(evt_evt13); | 969 | bfin_write_EVT13(evt_evt13); |
970 | bfin_write_EVT14(evt14_softirq); | 970 | bfin_write_EVT14(evt_evt14); |
971 | bfin_write_EVT15(evt_system_call); | 971 | bfin_write_EVT15(evt_system_call); |
972 | CSYNC(); | 972 | CSYNC(); |
973 | } | 973 | } |