Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index 1baf13ed5c3a..003f8eed32f4 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -289,7 +289,10 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
 
         if (request == PTRACE_TRACEME) {
                 ret = ptrace_traceme();
-                pt_succ_return(regs, 0);
+                if (ret < 0)
+                        pt_error_return(regs, -ret);
+                else
+                        pt_succ_return(regs, 0);
                 goto out;
         }