diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /kernel/pid_namespace.c | |
| parent | 1625324d22409e32e3f8eb86018cad72e1c09d61 (diff) | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
| download | op-kernel-dev-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.zip op-kernel-dev-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.tar.gz | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'kernel/pid_namespace.c')
| -rw-r--r-- | kernel/pid_namespace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index ea567b7..fab8ea8 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -179,9 +179,6 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) rc = sys_wait4(-1, NULL, __WALL, NULL); } while (rc != -ECHILD); - - /* Child reaper for the pid namespace is going away */ - pid_ns->child_reaper = NULL; acct_exit_ns(pid_ns); return; } |
