From 0f11aa928f32370b446018201856effd4abe2cab Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 28 Mar 2006 16:11:05 -0800
Subject: [PATCH] --- yaml --- r: 24548 b: refs/heads/master c:
 9b678ece42893b53aae5ed7cb8d7cb261cacb72c h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/exit.c   | 4 ++--
 trunk/kernel/ptrace.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 99b48fedd9d3..f275abed2e91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fafabd86f1b75ed3cc6a6ffbe6c3e53e3d8457d
+refs/heads/master: 9b678ece42893b53aae5ed7cb8d7cb261cacb72c
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index df26c33037d2..5b5e8b67680e 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -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;
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index d95a72c9279d..86a7f6c60cb2 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -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);
 }
  
 /*
@@ -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);