---

yaml --- r: 15816 b: refs/heads/master c: 783e338 h: refs/heads/master v: v3
git-mirror · Dec 13, 2005 · fd51de1 · fd51de1
1 parent aeb0ec9
commit fd51de1
Show file tree

Hide file tree

Showing 40 changed files with 387 additions and 161 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd803241744ad6e4262b6588c6af89e8fb794098
+refs/heads/master: 783e3385a134305d49d7b431df6e591265e7ec14
diff --git a/trunk/Documentation/arm/00-INDEX b/trunk/Documentation/arm/00-INDEX
@@ -16,5 +16,7 @@ empeg
 	- Empeg documentation
 mem_alignment
 	- alignment abort handler documentation
+memory.txt
+	- description of the virtual memory layout
 nwfpe
 	- NWFPE floating point emulator documentation
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;