diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-14 02:59:50 -0500 |
| commit | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (patch) | |
| tree | f4418610996064cab63600ca093de65356dcdfde /arch/arm/kernel | |
| parent | 927fe18397b3b1194a5b26b1d388d97e391e5fd2 (diff) | |
| parent | acd9b7b4e08a3f0f48afa922d8e371414cf2d3b2 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/arm/kernel')
| -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 9a340e790da5..2b84f78d7b0f 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; |