Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81760
b: refs/heads/master
c: 6618a3e
h: refs/heads/master
v: v3
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Dec 6, 2007
1 parent ec6fe2a commit 4ba8c9d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2f60e5faa9aef9a08d0abaee2007e5a0800d2c5
refs/heads/master: 6618a3e275519e10001a2ac4669f46141d4c108b
8 changes: 4 additions & 4 deletions trunk/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent)
void ptrace_untrace(struct task_struct *child)
{
spin_lock(&child->sighand->siglock);
if (child->state == TASK_TRACED) {
if (task_is_traced(child)) {
if (child->signal->flags & SIGNAL_STOP_STOPPED) {
child->state = TASK_STOPPED;
} else {
Expand Down Expand Up @@ -79,7 +79,7 @@ void __ptrace_unlink(struct task_struct *child)
add_parent(child);
}

if (child->state == TASK_TRACED)
if (task_is_traced(child))
ptrace_untrace(child);
}

Expand All @@ -103,9 +103,9 @@ int ptrace_check_attach(struct task_struct *child, int kill)
&& child->signal != NULL) {
ret = 0;
spin_lock_irq(&child->sighand->siglock);
if (child->state == TASK_STOPPED) {
if (task_is_stopped(child)) {
child->state = TASK_TRACED;
} else if (child->state != TASK_TRACED && !kill) {
} else if (!task_is_traced(child) && !kill) {
ret = -ESRCH;
}
spin_unlock_irq(&child->sighand->siglock);
Expand Down

0 comments on commit 4ba8c9d

Please sign in to comment.