From: Yoshinori Sato <ysato@users.sourceforge.jp>
Date: Tue, 19 Dec 2006 03:10:48 +0000 (+0900)
Subject: sh: Update SH-2 to use the debug trap jump table.
X-Git-Tag: v2.6.21-rc1~179^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4aa362bbdd801dd971acbe3db479fe871f2fed0b;p=linux-2.6-omap-h63xx.git

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 8de48102ac8..7f7d292f36e 100644
--- 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