From 6a3827d7509cbf96b7e961f8957c1f01d1bcf894 Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@kernel.org> Date: Wed, 8 Feb 2017 18:51:31 +0100 Subject: [PATCH] sched/headers: Prepare for new header dependencies before moving code to <linux/sched/numa_balancing.h> We are going to split <linux/sched/numa_balancing.h> out of <linux/sched.h>, which will have to be picked up from other headers and a couple of .c files. Create a trivial placeholder <linux/sched/numa_balancing.h> file that just maps to <linux/sched.h> to make this patch obviously correct and bisectable. Include the new header in the files that are going to need it. 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> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- fs/exec.c | 1 + fs/proc/array.c | 1 + include/linux/sched/numa_balancing.h | 6 ++++++ include/trace/events/sched.h | 2 +- kernel/fork.c | 1 + kernel/sched/sched.h | 1 + mm/huge_memory.c | 1 + mm/memory.c | 1 + mm/mempolicy.c | 1 + 9 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 include/linux/sched/numa_balancing.h diff --git a/fs/exec.c b/fs/exec.c index aa228b98ad5b1..e857c7260b1f8 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -35,6 +35,7 @@ #include <linux/sched/mm.h> #include <linux/sched/coredump.h> #include <linux/sched/signal.h> +#include <linux/sched/numa_balancing.h> #include <linux/pagemap.h> #include <linux/perf_event.h> #include <linux/highmem.h> diff --git a/fs/proc/array.c b/fs/proc/array.c index 61bea3a4ecc5e..cfe7f934a300a 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -61,6 +61,7 @@ #include <linux/string.h> #include <linux/mman.h> #include <linux/sched/mm.h> +#include <linux/sched/numa_balancing.h> #include <linux/proc_fs.h> #include <linux/ioport.h> #include <linux/uaccess.h> diff --git a/include/linux/sched/numa_balancing.h b/include/linux/sched/numa_balancing.h new file mode 100644 index 0000000000000..999182279f785 --- /dev/null +++ b/include/linux/sched/numa_balancing.h @@ -0,0 +1,6 @@ +#ifndef _LINUX_SCHED_NUMA_BALANCING_H +#define _LINUX_SCHED_NUMA_BALANCING_H + +#include <linux/sched.h> + +#endif /* _LINUX_SCHED_NUMA_BALANCING_H */ diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 9b90c57517a91..9e3ef6c99e4b0 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -4,7 +4,7 @@ #if !defined(_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SCHED_H -#include <linux/sched.h> +#include <linux/sched/numa_balancing.h> #include <linux/tracepoint.h> #include <linux/binfmts.h> diff --git a/kernel/fork.c b/kernel/fork.c index a5ad1e4ab604d..08d6c091ac7cf 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -16,6 +16,7 @@ #include <linux/sched/mm.h> #include <linux/sched/coredump.h> #include <linux/sched/user.h> +#include <linux/sched/numa_balancing.h> #include <linux/init.h> #include <linux/unistd.h> #include <linux/module.h> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 7dfeb14fa43c0..7e8ce0347fbf9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -6,6 +6,7 @@ #include <linux/sched/clock.h> #include <linux/sched/wake_q.h> #include <linux/sched/signal.h> +#include <linux/sched/numa_balancing.h> #include <linux/sched/mm.h> #include <linux/sched/cpufreq.h> #include <linux/u64_stats_sync.h> diff --git a/mm/huge_memory.c b/mm/huge_memory.c index dee92fa26bbb8..d36b2af4d1bf4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -10,6 +10,7 @@ #include <linux/mm.h> #include <linux/sched.h> #include <linux/sched/coredump.h> +#include <linux/sched/numa_balancing.h> #include <linux/highmem.h> #include <linux/hugetlb.h> #include <linux/mmu_notifier.h> diff --git a/mm/memory.c b/mm/memory.c index 6fc918b2c459e..d4994a28dc855 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -42,6 +42,7 @@ #include <linux/mm.h> #include <linux/sched/mm.h> #include <linux/sched/coredump.h> +#include <linux/sched/numa_balancing.h> #include <linux/hugetlb.h> #include <linux/mman.h> #include <linux/swap.h> diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 90892416ed75f..18e0105810dfd 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -74,6 +74,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/numa_balancing.h> #include <linux/nodemask.h> #include <linux/cpuset.h> #include <linux/slab.h> -- GitLab