diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-04 20:33:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-04 20:33:42 +0200 |
commit | 98bb318864ed10ae374573f1382147f113642059 (patch) | |
tree | c1b45f1c6bedadfec2040446f5509257a7b12be2 /arch/powerpc | |
parent | 5933f2ae353a93b1d3b501bc63c925531849bbc7 (diff) | |
parent | e0ac8457d020c0289ea566917267da9e5e6d9865 (diff) | |
download | blackbird-op-linux-98bb318864ed10ae374573f1382147f113642059.tar.gz blackbird-op-linux-98bb318864ed10ae374573f1382147f113642059.zip |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/ptrace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 55613e33e263..4edeeb325429 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -1591,7 +1591,10 @@ long arch_ptrace(struct task_struct *child, long request, } case PTRACE_SET_DEBUGREG: + if (ptrace_get_breakpoints(child) < 0) + return -ESRCH; ret = ptrace_set_debugreg(child, addr, data); + ptrace_put_breakpoints(child); break; #ifdef CONFIG_PPC64 |