Remove the following header inclusions from <linux/sched.h>:
#include <asm/param.h>
#include <linux/threads.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/timex.h>
#include <linux/jiffies.h>
#include <linux/rbtree.h>
#include <linux/thread_info.h>
#include <linux/cpumask.h>
#include <linux/errno.h>
#include <linux/nodemask.h>
#include <linux/preempt.h>
#include <asm/page.h>
#include <linux/smp.h>
#include <linux/compiler.h>
#include <linux/completion.h>
#include <linux/percpu.h>
#include <linux/topology.h>
#include <linux/rcupdate.h>
#include <linux/time.h>
#include <linux/timer.h>
#include <linux/llist.h>
#include <linux/uidgid.h>
#include <asm/processor.h>
because they are either not required, or are already included
naturally as part of the remaining headers.
( Fix up a single .c file that got hold of <linux/sysctl.h> via one
of these headers. )
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
include/linux/sched.h | 28 ----------------------------
include/linux/user_namespace.h | 1 +
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9ba2f75dc4c2..e3de6ad359fc 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -5,52 +5,24 @@
#include <linux/sched/prio.h>
-#include <asm/param.h> /* for HZ */
-
-#include <linux/threads.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/timex.h>
-#include <linux/jiffies.h>
#include <linux/plist.h>
-#include <linux/rbtree.h>
-#include <linux/thread_info.h>
-#include <linux/cpumask.h>
-#include <linux/errno.h>
-#include <linux/nodemask.h>
#include <linux/mm_types.h>
-#include <linux/preempt.h>
-
-#include <asm/page.h>
-#include <linux/smp.h>
#include <linux/sem.h>
#include <linux/shm.h>
#include <linux/signal.h>
-#include <linux/compiler.h>
-#include <linux/completion.h>
#include <linux/pid.h>
-#include <linux/percpu.h>
-#include <linux/topology.h>
#include <linux/seccomp.h>
-#include <linux/rcupdate.h>
#include <linux/rculist.h>
-#include <linux/time.h>
-#include <linux/param.h>
#include <linux/resource.h>
-#include <linux/timer.h>
#include <linux/hrtimer.h>
#include <linux/kcov.h>
#include <linux/task_io_accounting.h>
#include <linux/latencytop.h>
-#include <linux/llist.h>
-#include <linux/uidgid.h>
#include <linux/gfp.h>
#include <linux/magic.h>
-#include <asm/processor.h>
-
struct sched_attr;
struct sched_param;
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index eb209d4523f5..746ee376e603 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/sysctl.h>
#include <linux/err.h>
#define UID_GID_MAP_MAX_EXTENTS 5
--
2.7.4
