---

yaml --- r: 15058 b: refs/heads/master c: 22f975f h: refs/heads/master v: v3
git-mirror · Dec 10, 2005 · 621e31c · 621e31c
1 parent 000fad9
commit 621e31c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b35193f5868da5e63f5b4cfe8fbcf9f10fe65cd
+refs/heads/master: 22f975f4ffa707ea24507f6899bb9f5a1ff034bc
diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
 		 */
 		long aluop1, aluop2, ccbit;
 
+	        if ((insn & 0x0fffffd0) == 0x012fff10) {
+		        /*
+			 * bx or blx
+			 */
+			alt = get_user_reg(child, insn & 15);
+			break;
+		}
+
+
 		if ((insn & 0xf000) != 0xf000)
 			break;