---

yaml --- r: 350272 b: refs/heads/master c: ea13844 h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · ba625e2 · ba625e2
1 parent 9a90fc1
commit ba625e2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 111c225a5f8d872bc9327ada18d13b75edaa34be
+refs/heads/master: ea138446e51f7bfe55cdeffa3f1dd9cafc786bd8
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -83,7 +83,7 @@
 #endif
 
 #include "sched.h"
-#include "../workqueue_sched.h"
+#include "../workqueue_internal.h"
 #include "../smpboot.h"
 
 #define CREATE_TRACE_POINTS

diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -43,7 +43,7 @@
 #include <linux/idr.h>
 #include <linux/hashtable.h>
 
-#include "workqueue_sched.h"
+#include "workqueue_internal.h"
 
 enum {
 	/*

diff --git a/trunk/kernel/workqueue_internal.h b/trunk/kernel/workqueue_internal.h
@@ -0,0 +1,18 @@
+/*
+ * kernel/workqueue_internal.h
+ *
+ * Workqueue internal header file.  Only to be included by workqueue and
+ * core kernel subsystems.
+ */
+#ifndef _KERNEL_WORKQUEUE_INTERNAL_H
+#define _KERNEL_WORKQUEUE_INTERNAL_H
+
+/*
+ * Scheduler hooks for concurrency managed workqueue.  Only to be used from
+ * sched.c and workqueue.c.
+ */
+void wq_worker_waking_up(struct task_struct *task, unsigned int cpu);
+struct task_struct *wq_worker_sleeping(struct task_struct *task,
+				       unsigned int cpu);
+
+#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
diff --git a/trunk/kernel/workqueue_sched.h b/trunk/kernel/workqueue_sched.h