Hi Andrew! Folks!
unless there is a masterplan behind that, the
child_reaper argument to choose_new_parent()
is not used but shadows a global value ...
best,
Herbert
------------------
remove the gratuitous child_reaper argument
from choose_new_parent() and adjust the callers
Signed-off-by: Herbert P?tzl <[email protected]>
---
diff -NurpP linux-2.6.16-rc4/kernel/exit.c linux-2.6.16-rc4-chr/kernel/exit.c
--- linux-2.6.16-rc4/kernel/exit.c 2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-chr/kernel/exit.c 2006-02-20 20:40:05 +0100
@@ -533,7 +533,7 @@ static void exit_mm(struct task_struct *
mmput(mm);
}
-static inline void choose_new_parent(task_t *p, task_t *reaper, task_t *child_reaper)
+static inline void choose_new_parent(task_t *p, task_t *reaper)
{
/*
* Make sure we're not reparenting to ourselves and that
@@ -640,7 +640,7 @@ static void forget_original_parent(struc
if (father == p->real_parent) {
/* reparent with a reaper, real father it's us */
- choose_new_parent(p, reaper, child_reaper);
+ choose_new_parent(p, reaper);
reparent_thread(p, father, 0);
} else {
/* reparent ptraced task to its real parent */
@@ -661,7 +661,7 @@ static void forget_original_parent(struc
}
list_for_each_safe(_p, _n, &father->ptrace_children) {
p = list_entry(_p,struct task_struct,ptrace_list);
- choose_new_parent(p, reaper, child_reaper);
+ choose_new_parent(p, reaper);
reparent_thread(p, father, 1);
}
}