summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-09-21 19:57:12 +0200
committerClark Williams <williams@redhat.com>2012-04-13 11:01:16 -0500
commit53e993a0d925581d9e688cc8d50be3b27375b3cb (patch)
tree067e80a5196140b80564c0dabde3f720d6831f45
parent184b629ac6704d42462adb83dbe68950019324ea (diff)
signal-revert-ptrace-preempt-magic.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/signal.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 17afcaf582d0..6b5071febaee 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1909,15 +1909,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
if (gstop_done && ptrace_reparented(current))
do_notify_parent_cldstop(current, false, why);
- /*
- * Don't want to allow preemption here, because
- * sys_ptrace() needs this task to be inactive.
- *
- * XXX: implement read_unlock_no_resched().
- */
- preempt_disable();
read_unlock(&tasklist_lock);
- preempt_enable_no_resched();
schedule();
} else {
/*