diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 10:36:40 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:26 -0500 |
commit | 84f001e15737f8214b0f5f0f7dfec0fb1027938f (patch) | |
tree | d12076ca70631b86359132dc10bd8ac98e1e2274 /kernel | |
parent | 4c822698cba8bdd93724117eded12bf34eb80252 (diff) |
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/wake_q.h>
We are going to split <linux/sched/wake_q.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/wake_q.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>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/futex.c | 1 | ||||
-rw-r--r-- | kernel/locking/mutex.c | 1 | ||||
-rw-r--r-- | kernel/locking/rtmutex.c | 1 | ||||
-rw-r--r-- | kernel/locking/rtmutex_common.h | 1 | ||||
-rw-r--r-- | kernel/locking/rwsem-xadd.c | 3 | ||||
-rw-r--r-- | kernel/sched/sched.h | 1 |
6 files changed, 7 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index b687cb22301c..8ddcf9ea953c 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -61,6 +61,7 @@ | |||
61 | #include <linux/nsproxy.h> | 61 | #include <linux/nsproxy.h> |
62 | #include <linux/ptrace.h> | 62 | #include <linux/ptrace.h> |
63 | #include <linux/sched/rt.h> | 63 | #include <linux/sched/rt.h> |
64 | #include <linux/sched/wake_q.h> | ||
64 | #include <linux/hugetlb.h> | 65 | #include <linux/hugetlb.h> |
65 | #include <linux/freezer.h> | 66 | #include <linux/freezer.h> |
66 | #include <linux/bootmem.h> | 67 | #include <linux/bootmem.h> |
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index ad2d9e22697b..57f6311e2405 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/ww_mutex.h> | 21 | #include <linux/ww_mutex.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/sched/rt.h> | 23 | #include <linux/sched/rt.h> |
24 | #include <linux/sched/wake_q.h> | ||
24 | #include <linux/export.h> | 25 | #include <linux/export.h> |
25 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
26 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index d340be3a488f..d4f798491361 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
16 | #include <linux/sched/rt.h> | 16 | #include <linux/sched/rt.h> |
17 | #include <linux/sched/deadline.h> | 17 | #include <linux/sched/deadline.h> |
18 | #include <linux/sched/wake_q.h> | ||
18 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
19 | 20 | ||
20 | #include "rtmutex_common.h" | 21 | #include "rtmutex_common.h" |
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h index 990134617b4c..856dfff5c33a 100644 --- a/kernel/locking/rtmutex_common.h +++ b/kernel/locking/rtmutex_common.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #define __KERNEL_RTMUTEX_COMMON_H | 13 | #define __KERNEL_RTMUTEX_COMMON_H |
14 | 14 | ||
15 | #include <linux/rtmutex.h> | 15 | #include <linux/rtmutex.h> |
16 | #include <linux/sched/wake_q.h> | ||
16 | 17 | ||
17 | /* | 18 | /* |
18 | * This is the control structure for tasks blocked on a rt_mutex, | 19 | * This is the control structure for tasks blocked on a rt_mutex, |
diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c index 2ad8d8dc3bb1..4fe8d8ad4396 100644 --- a/kernel/locking/rwsem-xadd.c +++ b/kernel/locking/rwsem-xadd.c | |||
@@ -10,10 +10,11 @@ | |||
10 | * and Davidlohr Bueso <davidlohr@hp.com>. Based on mutexes. | 10 | * and Davidlohr Bueso <davidlohr@hp.com>. Based on mutexes. |
11 | */ | 11 | */ |
12 | #include <linux/rwsem.h> | 12 | #include <linux/rwsem.h> |
13 | #include <linux/sched.h> | ||
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include <linux/export.h> | 14 | #include <linux/export.h> |
15 | #include <linux/sched.h> | ||
16 | #include <linux/sched/rt.h> | 16 | #include <linux/sched/rt.h> |
17 | #include <linux/sched/wake_q.h> | ||
17 | #include <linux/osq_lock.h> | 18 | #include <linux/osq_lock.h> |
18 | 19 | ||
19 | #include "rwsem.h" | 20 | #include "rwsem.h" |
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 9b9cb260d9cf..683570739f46 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <linux/sched/sysctl.h> | 3 | #include <linux/sched/sysctl.h> |
4 | #include <linux/sched/topology.h> | 4 | #include <linux/sched/topology.h> |
5 | #include <linux/sched/rt.h> | 5 | #include <linux/sched/rt.h> |
6 | #include <linux/sched/wake_q.h> | ||
6 | #include <linux/u64_stats_sync.h> | 7 | #include <linux/u64_stats_sync.h> |
7 | #include <linux/sched/deadline.h> | 8 | #include <linux/sched/deadline.h> |
8 | #include <linux/kernel_stat.h> | 9 | #include <linux/kernel_stat.h> |