From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 17 Jun 2009 23:27:39 +0000 (-0700)
Subject: shift "ptrace implies WUNTRACED" from ptrace_do_wait() to wait_task_stopped()
X-Git-Tag: v2.6.31-rc1~210
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47918025efdabd34e96b13b26eb2cf2fd6fd1f7c;p=pandora-kernel.git

shift "ptrace implies WUNTRACED" from ptrace_do_wait() to wait_task_stopped()

No functional changes, preparation for the next patch.

ptrace_do_wait() adds WUNTRACED to options for wait_task_stopped() which
should always accept the stopped tracee, even if do_wait() was called
without WUNTRACED.

Change wait_task_stopped() to check "ptrace || WUNTRACED" instead.  This
makes the code more explicit, and "int options" argument becomes const in
do_wait() pathes.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed