diff options
-rw-r--r-- | kernel/sched/core.c | 2 | ||||
-rw-r--r-- | kernel/workqueue.c | 2 | ||||
-rw-r--r-- | kernel/workqueue_internal.h | 18 | ||||
-rw-r--r-- | kernel/workqueue_sched.h | 9 |
4 files changed, 20 insertions, 11 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 257002c13bb0..c6737f4fb63b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -83,7 +83,7 @@ | |||
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #include "sched.h" | 85 | #include "sched.h" |
86 | #include "../workqueue_sched.h" | 86 | #include "../workqueue_internal.h" |
87 | #include "../smpboot.h" | 87 | #include "../smpboot.h" |
88 | 88 | ||
89 | #define CREATE_TRACE_POINTS | 89 | #define CREATE_TRACE_POINTS |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 6b99ac7b19f6..b4e92061a934 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <linux/idr.h> | 43 | #include <linux/idr.h> |
44 | #include <linux/hashtable.h> | 44 | #include <linux/hashtable.h> |
45 | 45 | ||
46 | #include "workqueue_sched.h" | 46 | #include "workqueue_internal.h" |
47 | 47 | ||
48 | enum { | 48 | enum { |
49 | /* | 49 | /* |
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h new file mode 100644 index 000000000000..b3ea6ad5566b --- /dev/null +++ b/kernel/workqueue_internal.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* | ||
2 | * kernel/workqueue_internal.h | ||
3 | * | ||
4 | * Workqueue internal header file. Only to be included by workqueue and | ||
5 | * core kernel subsystems. | ||
6 | */ | ||
7 | #ifndef _KERNEL_WORKQUEUE_INTERNAL_H | ||
8 | #define _KERNEL_WORKQUEUE_INTERNAL_H | ||
9 | |||
10 | /* | ||
11 | * Scheduler hooks for concurrency managed workqueue. Only to be used from | ||
12 | * sched.c and workqueue.c. | ||
13 | */ | ||
14 | void wq_worker_waking_up(struct task_struct *task, unsigned int cpu); | ||
15 | struct task_struct *wq_worker_sleeping(struct task_struct *task, | ||
16 | unsigned int cpu); | ||
17 | |||
18 | #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */ | ||
diff --git a/kernel/workqueue_sched.h b/kernel/workqueue_sched.h deleted file mode 100644 index 2d10fc98dc79..000000000000 --- a/kernel/workqueue_sched.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | /* | ||
2 | * kernel/workqueue_sched.h | ||
3 | * | ||
4 | * Scheduler hooks for concurrency managed workqueue. Only to be | ||
5 | * included from sched.c and workqueue.c. | ||
6 | */ | ||
7 | void wq_worker_waking_up(struct task_struct *task, unsigned int cpu); | ||
8 | struct task_struct *wq_worker_sleeping(struct task_struct *task, | ||
9 | unsigned int cpu); | ||