summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2006-05-09 20:23:49 +0900
committerRalf Baechle <ralf@linux-mips.org>2006-06-01 00:28:32 +0100
commit867a521b4cd6c9d26cd736d85bfe84e10c0c05ac (patch)
tree696ad869518b9512ad25f4a01f00edcfd214a499 /arch
parent1c0c1ae4f3d5057d091677d0ef7dbaeb28122ded (diff)
downloadlinux-3.10-867a521b4cd6c9d26cd736d85bfe84e10c0c05ac.tar.gz
linux-3.10-867a521b4cd6c9d26cd736d85bfe84e10c0c05ac.tar.bz2
linux-3.10-867a521b4cd6c9d26cd736d85bfe84e10c0c05ac.zip
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/gdb-low.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 10f28fb9f00..5fd7a8af0c6 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