diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:25:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:25:58 -0800 |
| commit | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (patch) | |
| tree | b76f773ef1fab8302e233ac25d23f35d5341b6cd /arch | |
| parent | 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 (diff) | |
| parent | 22f975f4ffa707ea24507f6899bb9f5a1ff034bc (diff) | |
| download | linux-3.10-062dfa433cce9a2c3941b3b8b96ae678f11230fa.tar.gz linux-3.10-062dfa433cce9a2c3941b3b8b96ae678f11230fa.tar.bz2 linux-3.10-062dfa433cce9a2c3941b3b8b96ae678f11230fa.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/ptrace.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 9a340e790da..2b84f78d7b0 100644 --- a/arch/arm/kernel/ptrace.c +++ b/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; |