diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 17:52:04 +0200 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 17:52:04 +0200 |
commit | 7a0287df3e83a0012dfc496d4a8af9c1c5b126ef (patch) | |
tree | 27cc2f768de7e9014ffa899117bf219d0f20fb5e /arch/arm/kernel/ptrace.c | |
parent | arch/tile: prefer "tilepro" as the name of the 32-bit architecture (diff) | |
parent | Linux 2.6.39 (diff) | |
download | linux-7a0287df3e83a0012dfc496d4a8af9c1c5b126ef.tar.xz linux-7a0287df3e83a0012dfc496d4a8af9c1c5b126ef.zip |
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/arm/kernel/ptrace.c')
-rw-r--r-- | arch/arm/kernel/ptrace.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 2bf27f364d09..8182f45ca493 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -767,12 +767,20 @@ long arch_ptrace(struct task_struct *child, long request, #ifdef CONFIG_HAVE_HW_BREAKPOINT case PTRACE_GETHBPREGS: + if (ptrace_get_breakpoints(child) < 0) + return -ESRCH; + ret = ptrace_gethbpregs(child, addr, (unsigned long __user *)data); + ptrace_put_breakpoints(child); break; case PTRACE_SETHBPREGS: + if (ptrace_get_breakpoints(child) < 0) + return -ESRCH; + ret = ptrace_sethbpregs(child, addr, (unsigned long __user *)data); + ptrace_put_breakpoints(child); break; #endif |