Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index fedcdea..08eee6d 100644 (file)
--- 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);
        }