diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 18:17:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 18:17:24 -0400 |
| commit | 7c283324da366a3e6ffaad4352a51a3c71fcae17 (patch) | |
| tree | b4d02c340a17ac5134889c4eec7dcd06d407e3ca /kernel/fork.c | |
| parent | 9e5869f8d70d94850cf86163c57ba8d4daa29924 (diff) | |
| parent | 17ff3c1fa4c7bd0c38d751715033023ebf32fc96 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (8 patches)
MAINTAINERS: add maintainer for LED subsystem
mm: nobootmem: fix sign extend problem in __free_pages_memory()
drivers/leds: correct __devexit annotations
memcg: free spare array to avoid memory leak
namespaces, pid_ns: fix leakage on fork() failure
hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
mm: fix division by 0 in percpu_pagelist_fraction()
proc/pid/pagemap: correctly report non-present ptes and holes between vmas
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 b9372a0bff18..687a15d56243 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/audit.h> | 47 | #include <linux/audit.h> |
| 48 | #include <linux/memcontrol.h> | 48 | #include <linux/memcontrol.h> |
| 49 | #include <linux/ftrace.h> | 49 | #include <linux/ftrace.h> |
| 50 | #include <linux/proc_fs.h> | ||
| 50 | #include <linux/profile.h> | 51 | #include <linux/profile.h> |
| 51 | #include <linux/rmap.h> | 52 | #include <linux/rmap.h> |
| 52 | #include <linux/ksm.h> | 53 | #include <linux/ksm.h> |
| @@ -1464,6 +1465,8 @@ bad_fork_cleanup_io: | |||
| 1464 | if (p->io_context) | 1465 | if (p->io_context) |
| 1465 | exit_io_context(p); | 1466 | exit_io_context(p); |
| 1466 | bad_fork_cleanup_namespaces: | 1467 | bad_fork_cleanup_namespaces: |
| 1468 | if (unlikely(clone_flags & CLONE_NEWPID)) | ||
| 1469 | pid_ns_release_proc(p->nsproxy->pid_ns); | ||
| 1467 | exit_task_namespaces(p); | 1470 | exit_task_namespaces(p); |
| 1468 | bad_fork_cleanup_mm: | 1471 | bad_fork_cleanup_mm: |
| 1469 | if (p->mm) | 1472 | if (p->mm) |
