diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
| commit | d81344c50824a4d28a9397e97135d60075ac37ff (patch) | |
| tree | d25c443fb4a764cd788db857c49dd3d3f8f722d3 /include/linux/pid_namespace.h | |
| parent | 0de358f1c2642710d41190b73fbc295e675c4ab8 (diff) | |
| parent | 29bb9e5a75684106a37593ad75ec75ff8312731b (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before applying ongoing new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pid_namespace.h')
| -rw-r--r-- | include/linux/pid_namespace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 731e4ecee3bd..e2772666f004 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h @@ -4,6 +4,7 @@ #include <linux/sched.h> #include <linux/bug.h> #include <linux/mm.h> +#include <linux/workqueue.h> #include <linux/threads.h> #include <linux/nsproxy.h> #include <linux/kref.h> |