diff options
Diffstat (limited to 'arch/sh/kernel/traps_32.c')
-rw-r--r-- | arch/sh/kernel/traps_32.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c index 0d05fb3c48e3..2e58f7a6b746 100644 --- a/arch/sh/kernel/traps_32.c +++ b/arch/sh/kernel/traps_32.c | |||
@@ -662,11 +662,6 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5, | |||
662 | } | 662 | } |
663 | #endif | 663 | #endif |
664 | 664 | ||
665 | /* arch/sh/kernel/cpu/sh4/fpu.c */ | ||
666 | extern int do_fpu_inst(unsigned short, struct pt_regs *); | ||
667 | extern asmlinkage void do_fpu_state_restore(unsigned long r4, unsigned long r5, | ||
668 | unsigned long r6, unsigned long r7, struct pt_regs __regs); | ||
669 | |||
670 | asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5, | 665 | asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5, |
671 | unsigned long r6, unsigned long r7, | 666 | unsigned long r6, unsigned long r7, |
672 | struct pt_regs __regs) | 667 | struct pt_regs __regs) |
@@ -853,11 +848,11 @@ void __init trap_init(void) | |||
853 | set_exception_table_evt(0x820, do_illegal_slot_inst); | 848 | set_exception_table_evt(0x820, do_illegal_slot_inst); |
854 | #elif defined(CONFIG_SH_FPU) | 849 | #elif defined(CONFIG_SH_FPU) |
855 | #ifdef CONFIG_CPU_SUBTYPE_SHX3 | 850 | #ifdef CONFIG_CPU_SUBTYPE_SHX3 |
856 | set_exception_table_evt(0xd80, do_fpu_state_restore); | 851 | set_exception_table_evt(0xd80, fpu_state_restore_trap_handler); |
857 | set_exception_table_evt(0xda0, do_fpu_state_restore); | 852 | set_exception_table_evt(0xda0, fpu_state_restore_trap_handler); |
858 | #else | 853 | #else |
859 | set_exception_table_evt(0x800, do_fpu_state_restore); | 854 | set_exception_table_evt(0x800, fpu_state_restore_trap_handler); |
860 | set_exception_table_evt(0x820, do_fpu_state_restore); | 855 | set_exception_table_evt(0x820, fpu_state_restore_trap_handler); |
861 | #endif | 856 | #endif |
862 | #endif | 857 | #endif |
863 | 858 | ||