diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-02-06 09:56:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-03 01:45:39 +0100 |
| commit | b2d5bfea2d00a0000da18f7667c2b0e2c2f168d9 (patch) | |
| tree | 65e60d0efa18e0367fb23f73f12a907108a1685d /include | |
| parent | sched/headers: Remove <linux/magic.h> from <linux/sched/task_stack.h> (diff) | |
| download | linux-dev-b2d5bfea2d00a0000da18f7667c2b0e2c2f168d9.tar.xz linux-dev-b2d5bfea2d00a0000da18f7667c2b0e2c2f168d9.zip | |
sched/headers, timers: Remove the <linux/sysctl.h> include from <linux/timer.h>
So we want to simplify <linux/sched.h>'s header dependencies, but one
roadblock of that is <linux/timer.h>'s inclusion of sysctl.h,
which brings in other, problematic headers.
Note that timer.h's inclusion of sysctl.h can be avoided if we
pre-declare ctl_table - so do that.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/timer.h | 2 | ||||
| -rw-r--r-- | include/linux/user_namespace.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index c7bdf895179c..e6789b8757d5 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -212,7 +212,7 @@ struct hrtimer; extern enum hrtimer_restart it_real_fn(struct hrtimer *); #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON) -#include <linux/sysctl.h> +struct ctl_table; extern unsigned int sysctl_timer_migration; int timer_migration_handler(struct ctl_table *table, int write, diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index faa9bfb827da..be765234c0a2 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -5,6 +5,7 @@ #include <linux/nsproxy.h> #include <linux/ns_common.h> #include <linux/sched.h> +#include <linux/workqueue.h> #include <linux/rwsem.h> #include <linux/sysctl.h> #include <linux/err.h> |