From edc0e6249de60b0a1e21de23ffd8186ad4707e24 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 2 Jun 2011 11:14:00 +0200
Subject: [PATCH] --- yaml --- r: 256838 b: refs/heads/master c:
 62c124ff3bcdb414af635c2bf822c9e4f2a5abfa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6a9ff655f4dc..4224f0617460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dd3db54e77d21eb95e145f19ba53f68250d0e73
+refs/heads/master: 62c124ff3bcdb414af635c2bf822c9e4f2a5abfa
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 0c37d999c8b8..7f05f3a1267b 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -25,6 +25,12 @@
 #include <linux/hw_breakpoint.h>
 
 
+static int ptrace_trapping_sleep_fn(void *flags)
+{
+	schedule();
+	return 0;
+}
+
 /*
  * ptrace a task: make the debugger its new parent and
  * move it to the ptrace list.
@@ -270,8 +276,8 @@ static int ptrace_attach(struct task_struct *task)
 	mutex_unlock(&task->signal->cred_guard_mutex);
 out:
 	if (!retval)
-		wait_event(current->signal->wait_chldexit,
-			   !(task->jobctl & JOBCTL_TRAPPING));
+		wait_on_bit(&task->jobctl, JOBCTL_TRAPPING_BIT,
+			    ptrace_trapping_sleep_fn, TASK_UNINTERRUPTIBLE);
 	return retval;
 }
 
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 9ab91c516c3f..172a4c79f12c 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -272,8 +272,7 @@ static void task_clear_jobctl_trapping(struct task_struct *task)
 {
 	if (unlikely(task->jobctl & JOBCTL_TRAPPING)) {
 		task->jobctl &= ~JOBCTL_TRAPPING;
-		__wake_up_sync_key(&task->parent->signal->wait_chldexit,
-				   TASK_UNINTERRUPTIBLE, 1, task);
+		wake_up_bit(&task->jobctl, JOBCTL_TRAPPING_BIT);
 	}
 }