diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-08 02:45:17 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:27 -0500 |
commit | 4f17722c7256af8e17c2c4f29f170247264bdf48 (patch) | |
tree | 7f7e5f8036765d1b2809332572add86452274c2e | |
parent | ae7e81c077d60507dcec139e40a6d10cf932cf4b (diff) |
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/loadavg.h>
We are going to split <linux/sched/loadavg.h> out of <linux/sched.h>, which
will have to be picked up from a couple of .c files.
Create a trivial placeholder <linux/sched/topology.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/m68k/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/microblaze/kernel/heartbeat.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/sched.c | 1 | ||||
-rw-r--r-- | arch/s390/appldata/appldata_os.c | 1 | ||||
-rw-r--r-- | arch/sh/drivers/heartbeat.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/led.c | 1 | ||||
-rw-r--r-- | drivers/cpuidle/governors/menu.c | 1 | ||||
-rw-r--r-- | drivers/leds/trigger/ledtrig-heartbeat.c | 1 | ||||
-rw-r--r-- | drivers/platform/x86/intel_ips.c | 1 | ||||
-rw-r--r-- | fs/proc/loadavg.c | 1 | ||||
-rw-r--r-- | include/linux/sched/loadavg.h | 6 | ||||
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 1 | ||||
-rw-r--r-- | kernel/sched/core.c | 1 | ||||
-rw-r--r-- | kernel/sched/loadavg.c | 1 | ||||
-rw-r--r-- | kernel/sys.c | 1 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 1 | ||||
-rw-r--r-- | net/sched/em_meta.c | 1 |
18 files changed, 23 insertions, 0 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 4e5aa2f4f522..87160b4415fb 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/export.h> | 14 | #include <linux/export.h> |
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/sched/loadavg.h> | ||
17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
18 | #include <linux/param.h> | 19 | #include <linux/param.h> |
19 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c index 4643e3ab9414..2022130139d2 100644 --- a/arch/microblaze/kernel/heartbeat.c +++ b/arch/microblaze/kernel/heartbeat.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/sched/loadavg.h> | ||
12 | #include <linux/io.h> | 13 | #include <linux/io.h> |
13 | 14 | ||
14 | #include <asm/setup.h> | 15 | #include <asm/setup.h> |
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c index 88301e53f085..882944c36ef5 100644 --- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c +++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <linux/cpufreq.h> | 23 | #include <linux/cpufreq.h> |
24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
25 | #include <linux/sched/loadavg.h> | ||
25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
26 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
27 | #include <linux/workqueue.h> | 28 | #include <linux/workqueue.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 9b543df210fb..d317c84dc794 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
27 | #include <linux/sched/loadavg.h> | ||
27 | #include <linux/sched/rt.h> | 28 | #include <linux/sched/rt.h> |
28 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index 08b9e942a262..079446619f89 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/kernel_stat.h> | 17 | #include <linux/kernel_stat.h> |
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 <asm/appldata.h> | 21 | #include <asm/appldata.h> |
21 | #include <asm/smp.h> | 22 | #include <asm/smp.h> |
22 | 23 | ||
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index 49bace446a1a..c6d96049a0bb 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | #include <linux/sched/loadavg.h> | ||
24 | #include <linux/timer.h> | 25 | #include <linux/timer.h> |
25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
26 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 3ae36f36e758..44a3ed93c214 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/jiffies.h> | 8 | #include <linux/jiffies.h> |
9 | #include <linux/timer.h> | 9 | #include <linux/timer.h> |
10 | #include <linux/uaccess.h> | 10 | #include <linux/uaccess.h> |
11 | #include <linux/sched/loadavg.h> | ||
11 | 12 | ||
12 | #include <asm/auxio.h> | 13 | #include <asm/auxio.h> |
13 | 14 | ||
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 8d6d25c38c02..fe86060e48f7 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/hrtimer.h> | 18 | #include <linux/hrtimer.h> |
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/math64.h> | 22 | #include <linux/math64.h> |
22 | #include <linux/cpu.h> | 23 | #include <linux/cpu.h> |
23 | 24 | ||
diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c index e6f2f8b9f09a..afa3b4099214 100644 --- a/drivers/leds/trigger/ledtrig-heartbeat.c +++ b/drivers/leds/trigger/ledtrig-heartbeat.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
20 | #include <linux/sched/loadavg.h> | ||
20 | #include <linux/leds.h> | 21 | #include <linux/leds.h> |
21 | #include <linux/reboot.h> | 22 | #include <linux/reboot.h> |
22 | #include <linux/suspend.h> | 23 | #include <linux/suspend.h> |
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 55663b3d7282..58dcee562d64 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include <linux/module.h> | 68 | #include <linux/module.h> |
69 | #include <linux/pci.h> | 69 | #include <linux/pci.h> |
70 | #include <linux/sched.h> | 70 | #include <linux/sched.h> |
71 | #include <linux/sched/loadavg.h> | ||
71 | #include <linux/seq_file.h> | 72 | #include <linux/seq_file.h> |
72 | #include <linux/string.h> | 73 | #include <linux/string.h> |
73 | #include <linux/tick.h> | 74 | #include <linux/tick.h> |
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index aec66e6c2060..add5255ce7e0 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <linux/pid_namespace.h> | 3 | #include <linux/pid_namespace.h> |
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/seq_file.h> | 7 | #include <linux/seq_file.h> |
7 | #include <linux/seqlock.h> | 8 | #include <linux/seqlock.h> |
8 | #include <linux/time.h> | 9 | #include <linux/time.h> |
diff --git a/include/linux/sched/loadavg.h b/include/linux/sched/loadavg.h new file mode 100644 index 000000000000..3ae74be327e8 --- /dev/null +++ b/include/linux/sched/loadavg.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _LINUX_SCHED_LOADAVG_H | ||
2 | #define _LINUX_SCHED_LOADAVG_H | ||
3 | |||
4 | #include <linux/sched.h> | ||
5 | |||
6 | #endif /* _LINUX_SCHED_LOADAVG_H */ | ||
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index ca183919d302..308937c7a687 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/kmsg_dump.h> | 18 | #include <linux/kmsg_dump.h> |
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/sysrq.h> | 22 | #include <linux/sysrq.h> |
22 | #include <linux/smp.h> | 23 | #include <linux/smp.h> |
23 | #include <linux/utsname.h> | 24 | #include <linux/utsname.h> |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ed39d1d0b64a..11a0684a29a7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
9 | #include <linux/sched/clock.h> | 9 | #include <linux/sched/clock.h> |
10 | #include <uapi/linux/sched/types.h> | 10 | #include <uapi/linux/sched/types.h> |
11 | #include <linux/sched/loadavg.h> | ||
11 | #include <linux/cpuset.h> | 12 | #include <linux/cpuset.h> |
12 | #include <linux/delayacct.h> | 13 | #include <linux/delayacct.h> |
13 | #include <linux/init_task.h> | 14 | #include <linux/init_task.h> |
diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c index a2d6eb71f06b..7296b7308eca 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/export.h> | 9 | #include <linux/export.h> |
10 | #include <linux/sched/loadavg.h> | ||
10 | 11 | ||
11 | #include "sched.h" | 12 | #include "sched.h" |
12 | 13 | ||
diff --git a/kernel/sys.c b/kernel/sys.c index b07adca97ea3..28b8a4c1bc7e 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/binfmts.h> | 49 | #include <linux/binfmts.h> |
50 | 50 | ||
51 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
52 | #include <linux/sched/loadavg.h> | ||
52 | #include <linux/rcupdate.h> | 53 | #include <linux/rcupdate.h> |
53 | #include <linux/uidgid.h> | 54 | #include <linux/uidgid.h> |
54 | #include <linux/cred.h> | 55 | #include <linux/cred.h> |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 95b258dd75db..fb564acee0f3 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <linux/sched/loadavg.h> | ||
18 | #include <linux/syscore_ops.h> | 19 | #include <linux/syscore_ops.h> |
19 | #include <linux/clocksource.h> | 20 | #include <linux/clocksource.h> |
20 | #include <linux/jiffies.h> | 21 | #include <linux/jiffies.h> |
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 41c80b6c3906..ae7e4f5b348b 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
@@ -63,6 +63,7 @@ | |||
63 | #include <linux/types.h> | 63 | #include <linux/types.h> |
64 | #include <linux/kernel.h> | 64 | #include <linux/kernel.h> |
65 | #include <linux/sched.h> | 65 | #include <linux/sched.h> |
66 | #include <linux/sched/loadavg.h> | ||
66 | #include <linux/string.h> | 67 | #include <linux/string.h> |
67 | #include <linux/skbuff.h> | 68 | #include <linux/skbuff.h> |
68 | #include <linux/random.h> | 69 | #include <linux/random.h> |