sh: Update SH-2 to use the debug trap jump table.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index 8de48102ac85463bce4667040dc0510f19fb1e9c..7f7d292f36ec12d49aebaf956cbeafe4db2369bb 100644 (file)
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -178,12 +178,10 @@ interrupt_entry:
 8:     .long   do_exception_error
        
 trap_entry:
-       /* verbose BUG trapa entry check */
-       mov     #0x3e,r8
-       cmp/ge  r8,r9
-       bf/s    1f
-        add    #-0x10,r9
-       add     #0x10,r9
+       mov     #0x30,r8
+       cmp/ge  r8,r9           ! vector 0x20-0x2f is systemcall
+       bt      1f
+       add     #-0x10,r9       ! convert SH2 to SH3/4 ABI
 1:     
        shll2   r9                      ! TRA
        mov     #OFF_TRA,r8