From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Tue, 9 May 2006 11:23:49 +0000 (+0900)
Subject: [MIPS] Fix kgdb exception handler from user mode.
X-Git-Tag: v2.6.17-rc6~57^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=867a521b4cd6c9d26cd736d85bfe84e10c0c05ac;p=linux-2.6

[MIPS] Fix kgdb exception handler from user mode.

Fix a calculation of saved vector address in trap_low.

(damage done by lmo f4c72cc737561aab0d9c7f877abbc0a853f1c465)

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 10f28fb9f0..5fd7a8af0c 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -54,9 +54,11 @@
 		 */
 		mfc0	k0, CP0_CAUSE
 		andi	k0, k0, 0x7c
-		add	k1, k1, k0
-		PTR_L	k0, saved_vectors(k1)
-		jr	k0
+#ifdef CONFIG_64BIT
+		dsll	k0, k0, 1
+#endif
+		PTR_L	k1, saved_vectors(k0)
+		jr	k1
 		nop
 1:
 		move	k0, sp