Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

09f38dc1 · Linus Torvalds <[email protected]> · 2009-04-03 17:35:06 -07:00

* 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptrace: remove a useless goto

Merge commit. Changes below are compared with the first parent: 30a39e0e.

Changes

1 files changed · +0 −2

File	Status	Add	Del	Content
kernel/ptrace.c	modified	+0	−2	View file

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 5105f5a..aaad0ec 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -687,8 +687,6 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
 		goto out_put_task_struct;
 
 	ret = arch_ptrace(child, request, addr, data);
-	if (ret < 0)
-		goto out_put_task_struct;
 
  out_put_task_struct:
 	put_task_struct(child);