diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-08 12:51:35 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:34 -0500 |
commit | 03441a3482a31462c93509939a388877e3cd9261 (patch) | |
tree | 0b7a9401d6e2ff621ce95cca112e64de7041302c | |
parent | fd7712337ff09a248df424c5843c149586a3f017 (diff) |
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/stat.h>
We are going to split <linux/sched/stat.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/stat.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-- | arch/powerpc/kvm/book3s_hv.c | 1 | ||||
-rw-r--r-- | arch/s390/appldata/appldata_os.c | 1 | ||||
-rw-r--r-- | crypto/mcryptd.c | 1 | ||||
-rw-r--r-- | drivers/cpuidle/governors/menu.c | 1 | ||||
-rw-r--r-- | fs/proc/loadavg.c | 1 | ||||
-rw-r--r-- | fs/proc/root.c | 1 | ||||
-rw-r--r-- | fs/proc/stat.c | 1 | ||||
-rw-r--r-- | include/linux/sched/stat.h | 6 | ||||
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 1 | ||||
-rw-r--r-- | kernel/exit.c | 1 | ||||
-rw-r--r-- | kernel/fork.c | 1 | ||||
-rw-r--r-- | kernel/sched/sched.h | 1 | ||||
-rw-r--r-- | kernel/sys.c | 1 | ||||
-rw-r--r-- | kernel/time/tick-sched.c | 1 | ||||
-rw-r--r-- | virt/kvm/kvm_main.c | 1 |
15 files changed, 20 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index fc56a9ce785d..1ec86d9e2a82 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/preempt.h> | 24 | #include <linux/preempt.h> |
25 | #include <linux/sched/signal.h> | 25 | #include <linux/sched/signal.h> |
26 | #include <linux/sched/stat.h> | ||
26 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
27 | #include <linux/export.h> | 28 | #include <linux/export.h> |
28 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index 079446619f89..45b3178200ab 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/netdevice.h> | 18 | #include <linux/netdevice.h> |
19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
20 | #include <linux/sched/loadavg.h> | 20 | #include <linux/sched/loadavg.h> |
21 | #include <linux/sched/stat.h> | ||
21 | #include <asm/appldata.h> | 22 | #include <asm/appldata.h> |
22 | #include <asm/smp.h> | 23 | #include <asm/smp.h> |
23 | 24 | ||
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index c207458d6299..4e6472658852 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/scatterlist.h> | 25 | #include <linux/scatterlist.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
27 | #include <linux/sched/stat.h> | ||
27 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
28 | #include <linux/hardirq.h> | 29 | #include <linux/hardirq.h> |
29 | 30 | ||
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index fe86060e48f7..6d8a4026a903 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/tick.h> | 19 | #include <linux/tick.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/sched/loadavg.h> | 21 | #include <linux/sched/loadavg.h> |
22 | #include <linux/sched/stat.h> | ||
22 | #include <linux/math64.h> | 23 | #include <linux/math64.h> |
23 | #include <linux/cpu.h> | 24 | #include <linux/cpu.h> |
24 | 25 | ||
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index add5255ce7e0..983fce5c2418 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/proc_fs.h> | 4 | #include <linux/proc_fs.h> |
5 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
6 | #include <linux/sched/loadavg.h> | 6 | #include <linux/sched/loadavg.h> |
7 | #include <linux/sched/stat.h> | ||
7 | #include <linux/seq_file.h> | 8 | #include <linux/seq_file.h> |
8 | #include <linux/seqlock.h> | 9 | #include <linux/seqlock.h> |
9 | #include <linux/time.h> | 10 | #include <linux/time.h> |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 5d5fed20bfff..a50ba388255f 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/sched/stat.h> | ||
17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
18 | #include <linux/bitops.h> | 19 | #include <linux/bitops.h> |
19 | #include <linux/user_namespace.h> | 20 | #include <linux/user_namespace.h> |
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index e47c3e8c4dfe..b95556e036bb 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/kernel_stat.h> | 5 | #include <linux/kernel_stat.h> |
6 | #include <linux/proc_fs.h> | 6 | #include <linux/proc_fs.h> |
7 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
8 | #include <linux/sched/stat.h> | ||
8 | #include <linux/seq_file.h> | 9 | #include <linux/seq_file.h> |
9 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
10 | #include <linux/time.h> | 11 | #include <linux/time.h> |
diff --git a/include/linux/sched/stat.h b/include/linux/sched/stat.h new file mode 100644 index 000000000000..30fe012aecb0 --- /dev/null +++ b/include/linux/sched/stat.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _LINUX_SCHED_STAT_H | ||
2 | #define _LINUX_SCHED_STAT_H | ||
3 | |||
4 | #include <linux/sched.h> | ||
5 | |||
6 | #endif /* _LINUX_SCHED_STAT_H */ | ||
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 308937c7a687..bf48a492b4be 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/reboot.h> | 19 | #include <linux/reboot.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/sched/loadavg.h> | 21 | #include <linux/sched/loadavg.h> |
22 | #include <linux/sched/stat.h> | ||
22 | #include <linux/sysrq.h> | 23 | #include <linux/sysrq.h> |
23 | #include <linux/smp.h> | 24 | #include <linux/smp.h> |
24 | #include <linux/utsname.h> | 25 | #include <linux/utsname.h> |
diff --git a/kernel/exit.c b/kernel/exit.c index 48649ccbb649..5bad7dce1b7b 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
9 | #include <linux/sched/autogroup.h> | 9 | #include <linux/sched/autogroup.h> |
10 | #include <linux/sched/mm.h> | 10 | #include <linux/sched/mm.h> |
11 | #include <linux/sched/stat.h> | ||
11 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
13 | #include <linux/capability.h> | 14 | #include <linux/capability.h> |
diff --git a/kernel/fork.c b/kernel/fork.c index 8fbe8bcd1e20..8632905f64c5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -17,6 +17,7 @@ | |||
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/sched/numa_balancing.h> |
20 | #include <linux/sched/stat.h> | ||
20 | #include <linux/rtmutex.h> | 21 | #include <linux/rtmutex.h> |
21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
22 | #include <linux/unistd.h> | 23 | #include <linux/unistd.h> |
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 04f376cf7ba9..6c8a1db44dde 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/sched/numa_balancing.h> | 9 | #include <linux/sched/numa_balancing.h> |
10 | #include <linux/sched/mm.h> | 10 | #include <linux/sched/mm.h> |
11 | #include <linux/sched/cpufreq.h> | 11 | #include <linux/sched/cpufreq.h> |
12 | #include <linux/sched/stat.h> | ||
12 | #include <linux/u64_stats_sync.h> | 13 | #include <linux/u64_stats_sync.h> |
13 | #include <linux/sched/deadline.h> | 14 | #include <linux/sched/deadline.h> |
14 | #include <linux/kernel_stat.h> | 15 | #include <linux/kernel_stat.h> |
diff --git a/kernel/sys.c b/kernel/sys.c index e2d743fb7f55..8c0392c8be51 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
52 | #include <linux/sched/autogroup.h> | 52 | #include <linux/sched/autogroup.h> |
53 | #include <linux/sched/loadavg.h> | 53 | #include <linux/sched/loadavg.h> |
54 | #include <linux/sched/stat.h> | ||
54 | #include <linux/sched/mm.h> | 55 | #include <linux/sched/mm.h> |
55 | #include <linux/sched/coredump.h> | 56 | #include <linux/sched/coredump.h> |
56 | #include <linux/rcupdate.h> | 57 | #include <linux/rcupdate.h> |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 5e9e123b4321..29d79b175141 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/profile.h> | 21 | #include <linux/profile.h> |
22 | #include <linux/sched/signal.h> | 22 | #include <linux/sched/signal.h> |
23 | #include <linux/sched/clock.h> | 23 | #include <linux/sched/clock.h> |
24 | #include <linux/sched/stat.h> | ||
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
25 | #include <linux/irq_work.h> | 26 | #include <linux/irq_work.h> |
26 | #include <linux/posix-timers.h> | 27 | #include <linux/posix-timers.h> |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ae79f7679cc2..799499417f5b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/cpu.h> | 34 | #include <linux/cpu.h> |
35 | #include <linux/sched/signal.h> | 35 | #include <linux/sched/signal.h> |
36 | #include <linux/sched/mm.h> | 36 | #include <linux/sched/mm.h> |
37 | #include <linux/sched/stat.h> | ||
37 | #include <linux/cpumask.h> | 38 | #include <linux/cpumask.h> |
38 | #include <linux/smp.h> | 39 | #include <linux/smp.h> |
39 | #include <linux/anon_inodes.h> | 40 | #include <linux/anon_inodes.h> |