diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-08 12:51:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:30 -0500 |
commit | 55687da166bf51129ed6b110d7711f4c7560abe2 (patch) | |
tree | 09b48592eb4045c2340dae8a14cc40ce80660352 | |
parent | 38b8d208a4544c9a26b10baec89b8a21042e5305 (diff) |
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/cpufreq.h>
We are going to split <linux/sched/cpufreq.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/cpufreq.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-- | drivers/cpufreq/cpufreq_governor.c | 1 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq_governor.h | 1 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq_ondemand.c | 1 | ||||
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 2 | ||||
-rw-r--r-- | include/linux/sched/cpufreq.h | 6 | ||||
-rw-r--r-- | kernel/sched/sched.h | 1 |
6 files changed, 10 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index 631bd2c86c5e..47e24b5384b3 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <linux/export.h> | 19 | #include <linux/export.h> |
20 | #include <linux/kernel_stat.h> | 20 | #include <linux/kernel_stat.h> |
21 | #include <linux/sched.h> | ||
22 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
23 | 22 | ||
24 | #include "cpufreq_governor.h" | 23 | #include "cpufreq_governor.h" |
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index f5717ca070cc..0236ec2cd654 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/atomic.h> | 20 | #include <linux/atomic.h> |
21 | #include <linux/irq_work.h> | 21 | #include <linux/irq_work.h> |
22 | #include <linux/cpufreq.h> | 22 | #include <linux/cpufreq.h> |
23 | #include <linux/sched/cpufreq.h> | ||
23 | #include <linux/kernel_stat.h> | 24 | #include <linux/kernel_stat.h> |
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
25 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 4a017e895296..3937acf7e026 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/percpu-defs.h> | 16 | #include <linux/percpu-defs.h> |
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <linux/tick.h> | 18 | #include <linux/tick.h> |
19 | #include <linux/sched/cpufreq.h> | ||
19 | 20 | ||
20 | #include "cpufreq_ondemand.h" | 21 | #include "cpufreq_ondemand.h" |
21 | 22 | ||
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index eb0f7fb71685..8f6d29302aac 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/hrtimer.h> | 19 | #include <linux/hrtimer.h> |
20 | #include <linux/tick.h> | 20 | #include <linux/tick.h> |
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched/cpufreq.h> |
23 | #include <linux/list.h> | 23 | #include <linux/list.h> |
24 | #include <linux/cpu.h> | 24 | #include <linux/cpu.h> |
25 | #include <linux/cpufreq.h> | 25 | #include <linux/cpufreq.h> |
diff --git a/include/linux/sched/cpufreq.h b/include/linux/sched/cpufreq.h new file mode 100644 index 000000000000..07ed9664fa20 --- /dev/null +++ b/include/linux/sched/cpufreq.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _LINUX_SCHED_CPUFREQ_H | ||
2 | #define _LINUX_SCHED_CPUFREQ_H | ||
3 | |||
4 | #include <linux/sched.h> | ||
5 | |||
6 | #endif /* _LINUX_SCHED_CPUFREQ_H */ | ||
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 641249471952..7dfeb14fa43c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -7,6 +7,7 @@ | |||
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/mm.h> | 9 | #include <linux/sched/mm.h> |
10 | #include <linux/sched/cpufreq.h> | ||
10 | #include <linux/u64_stats_sync.h> | 11 | #include <linux/u64_stats_sync.h> |
11 | #include <linux/sched/deadline.h> | 12 | #include <linux/sched/deadline.h> |
12 | #include <linux/kernel_stat.h> | 13 | #include <linux/kernel_stat.h> |