Update of /cvsroot/linux-mips/linux/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv10490/kernel
Modified Files:
exit.c sched.c
Log Message:
Sync with OSS 2.4.13.
Index: exit.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/exit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exit.c 2001/10/19 21:19:40 1.7
+++ exit.c 2001/11/06 02:57:38 1.8
@@ -149,28 +149,21 @@
}
/*
- * When we die, we re-parent all our children.
- * Try to give them to another thread in our process
- * group, and if no such member exists, give it to
+ * When we die, we re-parent all our children to
* the global child reaper process (ie "init")
*/
static inline void forget_original_parent(struct task_struct * father)
{
- struct task_struct * p, *reaper;
+ struct task_struct * p;
read_lock(&tasklist_lock);
- /* Next in our thread group */
- reaper = next_thread(father);
- if (reaper == father)
- reaper = child_reaper;
-
for_each_task(p) {
if (p->p_opptr == father) {
/* We dont want people slaying init */
p->exit_signal = SIGCHLD;
p->self_exec_id++;
- p->p_opptr = reaper;
+ p->p_opptr = child_reaper;
if (p->pdeath_signal) send_sig(p->pdeath_signal, p, 0);
}
}
Index: sched.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/sched.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sched.c 2001/11/06 00:30:47 1.3
+++ sched.c 2001/11/06 02:57:38 1.4
@@ -1301,6 +1301,7 @@
current->session = 1;
current->pgrp = 1;
+ current->tty = NULL;
/* Become as one with the init task */
|
