3 files changed, 6 insertions, 14 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b4b14c32b28a..1f16fb1fea22 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1186,18 +1186,6 @@ extern void wait_task_inactive(task_t * p);
 #define remove_parent(p)        list_del_init(&(p)->sibling)
 #define add_parent(p)           list_add_tail(&(p)->sibling,&(p)->parent->children)
 
-#define REMOVE_LINKS(p) do {                                    \
-        if (thread_group_leader(p))                             \
-                list_del_init(&(p)->tasks);                     \
-        remove_parent(p);                                       \
-        } while (0)
-
-#define SET_LINKS(p) do {                                       \
-        if (thread_group_leader(p))                             \
-                list_add_tail(&(p)->tasks,&init_task.tasks);    \
-        add_parent(p);                                          \
-        } while (0)
-
 #define next_task(p)    list_entry((p)->tasks.next, struct task_struct, tasks)
 #define prev_task(p)    list_entry((p)->tasks.prev, struct task_struct, tasks)
 
diff --git a/kernel/exit.c b/kernel/exit.c
index 5b5e8b67680e..f436a6bd3fb7 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -54,11 +54,13 @@ static void __unhash_process(struct task_struct *p)
         if (thread_group_leader(p)) {
                 detach_pid(p, PIDTYPE_PGID);
                 detach_pid(p, PIDTYPE_SID);
+
+                list_del_init(&p->tasks);
                 if (p->pid)
                         __get_cpu_var(process_counts)--;
         }
 
-        REMOVE_LINKS(p);
+        remove_parent(p);
 }
 
 void release_task(struct task_struct * p)
diff --git a/kernel/fork.c b/kernel/fork.c
index c49bd193b058..74c67629ee62 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1181,7 +1181,7 @@ static task_t *copy_process(unsigned long clone_flags,
          */
         p->ioprio = current->ioprio;
 
-        SET_LINKS(p);
+        add_parent(p);
         if (unlikely(p->ptrace & PT_PTRACED))
                 __ptrace_link(p, current->parent);
 
@@ -1191,6 +1191,8 @@ static task_t *copy_process(unsigned long clone_flags,
                 p->signal->session = current->signal->session;
                 attach_pid(p, PIDTYPE_PGID, process_group(p));
                 attach_pid(p, PIDTYPE_SID, p->signal->session);
+
+                list_add_tail(&p->tasks, &init_task.tasks);
                 if (p->pid)
                         __get_cpu_var(process_counts)++;
         }