From ba625e2b87650c1ea9519ce527120ad38c9e917b Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 18 Jan 2013 14:05:55 -0800
Subject: [PATCH] --- yaml --- r: 350272 b: refs/heads/master c:
 ea138446e51f7bfe55cdeffa3f1dd9cafc786bd8 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/kernel/sched/core.c         |  2 +-
 trunk/kernel/workqueue.c          |  2 +-
 trunk/kernel/workqueue_internal.h | 18 ++++++++++++++++++
 trunk/kernel/workqueue_sched.h    |  9 ---------
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 trunk/kernel/workqueue_internal.h
 delete mode 100644 trunk/kernel/workqueue_sched.h

diff --git a/[refs] b/[refs]
index 54928eaf6c75..98c831de6e51 100644
--- 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
index 257002c13bb0..c6737f4fb63b 100644
--- 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
index 6b99ac7b19f6..b4e92061a934 100644
--- 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
new file mode 100644
index 000000000000..b3ea6ad5566b
--- /dev/null
+++ 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
deleted file mode 100644
index 2d10fc98dc79..000000000000
--- a/trunk/kernel/workqueue_sched.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * kernel/workqueue_sched.h
- *
- * Scheduler hooks for concurrency managed workqueue.  Only to be
- * included 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);