aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/ptrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r--kernel/ptrace.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index b0d4ab4dfd3d..74730e0c1be1 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -53,7 +53,7 @@ void ptrace_untrace(struct task_struct *child)
53 spin_lock(&child->sighand->siglock); 53 spin_lock(&child->sighand->siglock);
54 if (task_is_traced(child)) { 54 if (task_is_traced(child)) {
55 if (child->signal->flags & SIGNAL_STOP_STOPPED) { 55 if (child->signal->flags & SIGNAL_STOP_STOPPED) {
56 child->state = TASK_STOPPED; 56 __set_task_state(child, TASK_STOPPED);
57 } else { 57 } else {
58 signal_wake_up(child, 1); 58 signal_wake_up(child, 1);
59 } 59 }
@@ -103,18 +103,16 @@ int ptrace_check_attach(struct task_struct *child, int kill)
103 && child->signal != NULL) { 103 && child->signal != NULL) {
104 ret = 0; 104 ret = 0;
105 spin_lock_irq(&child->sighand->siglock); 105 spin_lock_irq(&child->sighand->siglock);
106 if (task_is_stopped(child)) { 106 if (task_is_stopped(child))
107 child->state = TASK_TRACED; 107 child->state = TASK_TRACED;
108 } else if (!task_is_traced(child) && !kill) { 108 else if (!task_is_traced(child) && !kill)
109 ret = -ESRCH; 109 ret = -ESRCH;
110 }
111 spin_unlock_irq(&child->sighand->siglock); 110 spin_unlock_irq(&child->sighand->siglock);
112 } 111 }
113 read_unlock(&tasklist_lock); 112 read_unlock(&tasklist_lock);
114 113
115 if (!ret && !kill) { 114 if (!ret && !kill)
116 wait_task_inactive(child); 115 wait_task_inactive(child);
117 }
118 116
119 /* All systems go.. */ 117 /* All systems go.. */
120 return ret; 118 return ret;