projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/jack' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
signal.c
diff --git
a/kernel/signal.c
b/kernel/signal.c
index 2a74fe87c0ddb7c46ede38a542c7e2331a5aa44e..1c8814481a117d5df731465b5a56bbf4738c48c1 100644
(file)
--- a/
kernel/signal.c
+++ b/
kernel/signal.c
@@
-1575,7
+1575,15
@@
static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)
read_lock(&tasklist_lock);
if (may_ptrace_stop()) {
do_notify_parent_cldstop(current, CLD_TRAPPED);
read_lock(&tasklist_lock);
if (may_ptrace_stop()) {
do_notify_parent_cldstop(current, CLD_TRAPPED);
+ /*
+ * 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);
read_unlock(&tasklist_lock);
+ preempt_enable_no_resched();
schedule();
} else {
/*
schedule();
} else {
/*