X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fexit.c;h=08eee6d20cf89644a452942a9d257b3d983ec26b;hb=34a75f0025b9cf803b6a88db032e6ad6950c9313;hp=fedcdeaf3e60cb32bb0b16a993a3e7fc1d0b3d26;hpb=43bc926fffd92024b46cafaf7350d669ba9ca884;p=linux-2.6.git diff --git a/kernel/exit.c b/kernel/exit.c index fedcdeaf3..08eee6d20 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -294,7 +294,6 @@ static void reparent_to_init(void) ptrace_unlink(current); /* Reparent to init */ remove_parent(current); - /* FIXME: handle vchild_reaper/initpid */ current->parent = child_reaper; current->real_parent = child_reaper; add_parent(current); @@ -458,6 +457,7 @@ static void close_files(struct files_struct * files) } i++; set >>= 1; + cond_resched(); } } } @@ -728,7 +728,6 @@ static void forget_original_parent(struct task_struct * father, } list_for_each_safe(_p, _n, &father->ptrace_children) { p = list_entry(_p,struct task_struct,ptrace_list); - /* check for reaper context */ choose_new_parent(p, reaper); reparent_thread(p, father, 1); }