From: Linus Torvalds Date: Sat, 4 Apr 2009 00:35:06 +0000 (-0700) Subject: Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=09f38dc19deba9eae1d668dde8bdd2aaed3479ed;hp=30a39e0e97f948e3ac8eeacd54d09f4bbfbab64b;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 5105f5a6a2c..aaad0ec3419 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);