Commit 09f38dc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-cleanups-for-linus' of...

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

* 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptrace: remove a useless goto
parents 30a39e0e bbb76b55
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -687,8 +687,6 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
		goto out_put_task_struct;
		goto out_put_task_struct;


	ret = arch_ptrace(child, request, addr, data);
	ret = arch_ptrace(child, request, addr, data);
	if (ret < 0)
		goto out_put_task_struct;


 out_put_task_struct:
 out_put_task_struct:
	put_task_struct(child);
	put_task_struct(child);