diff options
| author | Linus Torvalds | 2012-10-19 14:07:55 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-19 14:07:55 -0700 |
| commit | 4a1f2b0fba89cdb3b2b1be99a7411bfd24d61be5 (patch) | |
| tree | e14158bdaf2a4723f98fc2411fb65416edb9f90b /include/linux | |
| parent | deb521c44fa529b24cc78a64702757a683f82487 (diff) | |
| parent | fe73fbe1c5eda709084dedb66cbdd4b86826cce7 (diff) | |
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton:
"Seven fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
lib/dma-debug.c: fix __hash_bucket_find()
mm: compaction: correct the nr_strict va isolated check for CMA
firmware/memmap: avoid type conflicts with the generic memmap_init()
pidns: remove recursion from free_pid_ns()
drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
kernel/sys.c: fix stack memory content leak via UNAME26
linux/coredump.h needs asm/siginfo.h
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/coredump.h | 1 | ||||
| -rw-r--r-- | include/linux/pid_namespace.h | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/coredump.h b/include/linux/coredump.h index 1775eb8acc03..1d7399314a89 100644 --- a/include/linux/coredump.h +++ b/include/linux/coredump.h @@ -4,6 +4,7 @@ #include <linux/types.h> #include <linux/mm.h> #include <linux/fs.h> +#include <asm/siginfo.h> /* * These are the only things you should do on a core-file: use only these diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 00474b047145..65e3e87eacc5 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h @@ -47,15 +47,9 @@ static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns) } extern struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns); -extern void free_pid_ns(struct kref *kref); extern void zap_pid_ns_processes(struct pid_namespace *pid_ns); extern int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd); - -static inline void put_pid_ns(struct pid_namespace *ns) -{ - if (ns != &init_pid_ns) - kref_put(&ns->kref, free_pid_ns); -} +extern void put_pid_ns(struct pid_namespace *ns); #else /* !CONFIG_PID_NS */ #include <linux/err.h> |