From 8684c741ef21ff4bead90baedd884cd0d04da47b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 2 Jan 2008 13:48:27 -0800
Subject: [PATCH] --- yaml --- r: 75242 b: refs/heads/master c:
 b8c9a18712f7b617fda66d878ce3759c9e575ba0 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/ptrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 848ffddfb603..ccf45d96f34c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 831830b5a2b5d413407adf380ef62fe17d6fcbf2
+refs/heads/master: b8c9a18712f7b617fda66d878ce3759c9e575ba0
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 0c65d306f412..c25db863081d 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -196,7 +196,7 @@ int ptrace_attach(struct task_struct *task)
 	/* the same process cannot be attached many times */
 	if (task->ptrace & PT_PTRACED)
 		goto bad;
-	retval = may_attach(task);
+	retval = __ptrace_may_attach(task);
 	if (retval)
 		goto bad;