sched/headers: Prepare for new header dependencies before moving code to <linux/sched...

We are going to split  <linux/sched/idle.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/idle.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 <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index f37f2d8a2989d08d37304ffd4689a381cc0ddb37..bda3c27f0da06c494bac1faf99abb273f9c06ae3 100644 (file)
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -2,6 +2,7 @@
 #define _ASM_X86_MWAIT_H
 
 #include <linux/sched.h>
+#include <linux/sched/idle.h>
 
 #include <asm/cpufeature.h>
 

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 7780efa635b911cff705e0bd73abb6064a3e8f62..6395e0cd7dd644d1e7e2c468769619436155cd91 100644 (file)
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -7,6 +7,7 @@
 #include <linux/prctl.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/sched/idle.h>
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/pm.h>

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index ab264d393233683c28bac7e0770abb0ffe49b2ec..e53fb861beb0451c322ebb7667d5cb6e0630d867 100644 (file)
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -11,6 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/sched/idle.h>
 #include <linux/cpuidle.h>
 #include <linux/cpumask.h>
 #include <linux/tick.h>

diff --git a/include/linux/sched/idle.h b/include/linux/sched/idle.h
new file mode 100644 (file)
index 0000000..a3cf79b
--- /dev/null
+++ b/include/linux/sched/idle.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_SCHED_IDLE_H
+#define _LINUX_SCHED_IDLE_H
+
+#include <linux/sched.h>
+
+#endif /* _LINUX_SCHED_IDLE_H */

diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index 4f1159f76f9229442673cdd9a0b9d508aae13798..184b56b8aa64ffcd566db5c5eb16321541cc1990 100644 (file)
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -3,4 +3,6 @@
 
 #include <linux/sched.h>
 
+#include <linux/sched/idle.h>
+
 #endif /* _LINUX_SCHED_TOPOLOGY_H */

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 6a4bae0a649d9ad98e90d0f7c429fc2c01af772b..ac6d5176463dca591b40263d9524d728c363ec09 100644 (file)
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -2,6 +2,7 @@
  * Generic entry point for the idle threads
  */
 #include <linux/sched.h>
+#include <linux/sched/idle.h>
 #include <linux/cpu.h>
 #include <linux/cpuidle.h>
 #include <linux/cpuhotplug.h>

diff --git a/kernel/smp.c b/kernel/smp.c
index 77fcdb9f27756f7a73d4b87afed0ad28f0e56359..a817769b53c0e1e312b46f90adccc0f0e10be6f2 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -17,6 +17,7 @@
 #include <linux/smp.h>
 #include <linux/cpu.h>
 #include <linux/sched.h>
+#include <linux/sched/idle.h>
 #include <linux/hypervisor.h>
 
 #include "smpboot.h"