Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24548
b: refs/heads/master
c: 9b678ec
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 29, 2006
1 parent d058693 commit 0f11aa9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 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: 8fafabd86f1b75ed3cc6a6ffbe6c3e53e3d8457d
refs/heads/master: 9b678ece42893b53aae5ed7cb8d7cb261cacb72c
4 changes: 2 additions & 2 deletions trunk/kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ static void reparent_to_init(void)

ptrace_unlink(current);
/* Reparent to init */
REMOVE_LINKS(current);
remove_parent(current);
current->parent = child_reaper;
current->real_parent = child_reaper;
SET_LINKS(current);
add_parent(current);

/* Set the exit signal to SIGCHLD so we signal init on exit */
current->exit_signal = SIGCHLD;
Expand Down
8 changes: 4 additions & 4 deletions trunk/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ void __ptrace_link(task_t *child, task_t *new_parent)
if (child->parent == new_parent)
return;
list_add(&child->ptrace_list, &child->parent->ptrace_children);
REMOVE_LINKS(child);
remove_parent(child);
child->parent = new_parent;
SET_LINKS(child);
add_parent(child);
}

/*
Expand Down Expand Up @@ -77,9 +77,9 @@ void __ptrace_unlink(task_t *child)
child->ptrace = 0;
if (!list_empty(&child->ptrace_list)) {
list_del_init(&child->ptrace_list);
REMOVE_LINKS(child);
remove_parent(child);
child->parent = child->real_parent;
SET_LINKS(child);
add_parent(child);
}

ptrace_untrace(child);
Expand Down

0 comments on commit 0f11aa9

Please sign in to comment.