diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-05-22 06:12:10 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-05-22 06:12:10 +0200 |
| commit | 93cf213940db180b5bb710d21fe2f6dc7ca1e252 (patch) | |
| tree | c377b29f5387081dc64c882e7dad2ac4a2c161e3 /kernel/fork.c | |
| parent | a48c18e8b30a8ec31acb09d45741fd99dd5baf06 (diff) | |
| parent | 091ce3d38e5e57cf7dd44d66335725910e928f59 (diff) | |
| download | kernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.zip kernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.tar.gz kernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 06909a9..fa6030d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -48,6 +48,7 @@ #include <linux/audit.h> #include <linux/memcontrol.h> #include <linux/ftrace.h> +#include <linux/proc_fs.h> #include <linux/profile.h> #include <linux/rmap.h> #include <linux/ksm.h> @@ -1394,6 +1395,8 @@ bad_fork_cleanup_io: if (p->io_context) exit_io_context(p); bad_fork_cleanup_namespaces: + if (unlikely(clone_flags & CLONE_NEWPID)) + pid_ns_release_proc(p->nsproxy->pid_ns); exit_task_namespaces(p); bad_fork_cleanup_mm: if (p->mm) { |