summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-02-08 12:51:31 -0500
committerIngo Molnar <mingo@kernel.org>2017-03-02 02:42:30 -0500
commit6a3827d7509cbf96b7e961f8957c1f01d1bcf894 (patch)
treed65f81a0ad3f81798bd0bf67c5ad7b73d7d0bab9
parent010426079ec1228a7f980d2eef766a84c0f9241a (diff)
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>
-rw-r--r--fs/exec.c1
-rw-r--r--fs/proc/array.c1
-rw-r--r--include/linux/sched/numa_balancing.h6
-rw-r--r--include/trace/events/sched.h2
-rw-r--r--kernel/fork.c1
-rw-r--r--kernel/sched/sched.h1
-rw-r--r--mm/huge_memory.c1
-rw-r--r--mm/memory.c1
-rw-r--r--mm/mempolicy.c1
9 files changed, 14 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c
index aa228b98ad5b..e857c7260b1f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -35,6 +35,7 @@
35#include <linux/sched/mm.h> 35#include <linux/sched/mm.h>
36#include <linux/sched/coredump.h> 36#include <linux/sched/coredump.h>
37#include <linux/sched/signal.h> 37#include <linux/sched/signal.h>
38#include <linux/sched/numa_balancing.h>
38#include <linux/pagemap.h> 39#include <linux/pagemap.h>
39#include <linux/perf_event.h> 40#include <linux/perf_event.h>
40#include <linux/highmem.h> 41#include <linux/highmem.h>
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 61bea3a4ecc5..cfe7f934a300 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -61,6 +61,7 @@
61#include <linux/string.h> 61#include <linux/string.h>
62#include <linux/mman.h> 62#include <linux/mman.h>
63#include <linux/sched/mm.h> 63#include <linux/sched/mm.h>
64#include <linux/sched/numa_balancing.h>
64#include <linux/proc_fs.h> 65#include <linux/proc_fs.h>
65#include <linux/ioport.h> 66#include <linux/ioport.h>
66#include <linux/uaccess.h> 67#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 000000000000..999182279f78
--- /dev/null
+++ b/include/linux/sched/numa_balancing.h
@@ -0,0 +1,6 @@
1#ifndef _LINUX_SCHED_NUMA_BALANCING_H
2#define _LINUX_SCHED_NUMA_BALANCING_H
3
4#include <linux/sched.h>
5
6#endif /* _LINUX_SCHED_NUMA_BALANCING_H */
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 9b90c57517a9..9e3ef6c99e4b 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -4,7 +4,7 @@
4#if !defined(_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ) 4#if !defined(_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ)
5#define _TRACE_SCHED_H 5#define _TRACE_SCHED_H
6 6
7#include <linux/sched.h> 7#include <linux/sched/numa_balancing.h>
8#include <linux/tracepoint.h> 8#include <linux/tracepoint.h>
9#include <linux/binfmts.h> 9#include <linux/binfmts.h>
10 10
diff --git a/kernel/fork.c b/kernel/fork.c
index a5ad1e4ab604..08d6c091ac7c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -16,6 +16,7 @@
16#include <linux/sched/mm.h> 16#include <linux/sched/mm.h>
17#include <linux/sched/coredump.h> 17#include <linux/sched/coredump.h>
18#include <linux/sched/user.h> 18#include <linux/sched/user.h>
19#include <linux/sched/numa_balancing.h>
19#include <linux/init.h> 20#include <linux/init.h>
20#include <linux/unistd.h> 21#include <linux/unistd.h>
21#include <linux/module.h> 22#include <linux/module.h>
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 7dfeb14fa43c..7e8ce0347fbf 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -6,6 +6,7 @@
6#include <linux/sched/clock.h> 6#include <linux/sched/clock.h>
7#include <linux/sched/wake_q.h> 7#include <linux/sched/wake_q.h>
8#include <linux/sched/signal.h> 8#include <linux/sched/signal.h>
9#include <linux/sched/numa_balancing.h>
9#include <linux/sched/mm.h> 10#include <linux/sched/mm.h>
10#include <linux/sched/cpufreq.h> 11#include <linux/sched/cpufreq.h>
11#include <linux/u64_stats_sync.h> 12#include <linux/u64_stats_sync.h>
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index dee92fa26bbb..d36b2af4d1bf 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -10,6 +10,7 @@
10#include <linux/mm.h> 10#include <linux/mm.h>
11#include <linux/sched.h> 11#include <linux/sched.h>
12#include <linux/sched/coredump.h> 12#include <linux/sched/coredump.h>
13#include <linux/sched/numa_balancing.h>
13#include <linux/highmem.h> 14#include <linux/highmem.h>
14#include <linux/hugetlb.h> 15#include <linux/hugetlb.h>
15#include <linux/mmu_notifier.h> 16#include <linux/mmu_notifier.h>
diff --git a/mm/memory.c b/mm/memory.c
index 6fc918b2c459..d4994a28dc85 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -42,6 +42,7 @@
42#include <linux/mm.h> 42#include <linux/mm.h>
43#include <linux/sched/mm.h> 43#include <linux/sched/mm.h>
44#include <linux/sched/coredump.h> 44#include <linux/sched/coredump.h>
45#include <linux/sched/numa_balancing.h>
45#include <linux/hugetlb.h> 46#include <linux/hugetlb.h>
46#include <linux/mman.h> 47#include <linux/mman.h>
47#include <linux/swap.h> 48#include <linux/swap.h>
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 90892416ed75..18e0105810df 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -74,6 +74,7 @@
74#include <linux/kernel.h> 74#include <linux/kernel.h>
75#include <linux/sched.h> 75#include <linux/sched.h>
76#include <linux/sched/mm.h> 76#include <linux/sched/mm.h>
77#include <linux/sched/numa_balancing.h>
77#include <linux/nodemask.h> 78#include <linux/nodemask.h>
78#include <linux/cpuset.h> 79#include <linux/cpuset.h>
79#include <linux/slab.h> 80#include <linux/slab.h>