summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-02-05 16:03:58 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-03 01:45:39 +0100
commit50ff9d130014f7b19541dbf607a615a72b75b778 (patch)
tree84b73a3a416307405e9cf6cf225a37937e1caa20
parent5c0d0f36414f9f8a292b42e797f9284b127d79c2 (diff)
downloadlinux-50ff9d130014f7b19541dbf607a615a72b75b778.tar.gz
linux-50ff9d130014f7b19541dbf607a615a72b75b778.tar.xz
sched/headers: Remove <linux/magic.h> from <linux/sched/task_stack.h>
It's not used by any of the scheduler methods, but <linux/sched/task_stack.h> needs it to pick up STACK_END_MAGIC. 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>
-rw-r--r--include/linux/sched.h1
-rw-r--r--kernel/cgroup/cgroup-v1.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index bd0111a06aa2..559be4f1aee5 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -22,7 +22,6 @@
#include <linux/task_io_accounting.h>
#include <linux/latencytop.h>
#include <linux/topology.h>
-#include <linux/magic.h>
#include <asm/current.h>
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index abc585858685..56eba9caa632 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -7,6 +7,7 @@
#include <linux/mm.h>
#include <linux/sched/signal.h>
#include <linux/sched/task.h>
+#include <linux/magic.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delayacct.h>