2 files changed, 9 insertions, 4 deletions

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0c37d999c8b8..7f05f3a1267b 100644
--- a/kernel/ptrace.c
+++ b/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 @@ unlock_creds:
         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/kernel/signal.c b/kernel/signal.c
index 9ab91c516c3f..172a4c79f12c 100644
--- a/kernel/signal.c
+++ b/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);
         }
 }