From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 27 Oct 2010 22:33:44 +0000 (-0700)
Subject: ptrace: annotate lock context change on exit_ptrace()
X-Git-Tag: v2.6.37-rc1~85^2~88
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=c4b5ed250eebf854d40f27b43362c80f115cb57a

ptrace: annotate lock context change on exit_ptrace()

exit_ptrace() releases and regrabs tasklist_lock but was missing proper
annotation.  Add it.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Roland McGrath <roland@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Oleg Nesterov <oleg@redhat.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index f34d798ef4a..4afd9b86cc0 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -329,6 +329,8 @@ int ptrace_detach(struct task_struct *child, unsigned int data)
  * and reacquire the lock.
  */
 void exit_ptrace(struct task_struct *tracer)
+	__releases(&tasklist_lock)
+	__acquires(&tasklist_lock)
 {
 	struct task_struct *p, *n;
 	LIST_HEAD(ptrace_dead);