From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>,
Ming Lei <ming.lei@canonical.com>,
Alex Riesen <raa.lkml@gmail.com>,
Alan Stern <stern@rowland.harvard.edu>,
Jens Axboe <axboe@kernel.dk>,
USB list <linux-usb@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rusty Russell <rusty@rustcorp.com.au>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 2/5] workqueue: rename kernel/workqueue_sched.h to kernel/workqueue_internal.h
Date: Fri, 18 Jan 2013 14:10:30 -0800 [thread overview]
Message-ID: <20130118221030.GD24579@htj.dyndns.org> (raw)
In-Reply-To: <CA+55aFwAwX_o6ocGhd1WwUwxfOnh+S6aKeZdEpeeHVAnBm4uVQ@mail.gmail.com>
>From ea138446e51f7bfe55cdeffa3f1dd9cafc786bd8 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 18 Jan 2013 14:05:55 -0800
Workqueue wants to expose more interface internal to kernel/. Instead
of adding a new header file, repurpose kernel/workqueue_sched.h.
Rename it to workqueue_internal.h and add include protector.
This patch doesn't introduce any functional changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
Ingo, Peter, changes to scheduler is trivial. If there's no
objection, I'd like to route this with the rest of workqueue and async
changes.
Thanks.
kernel/sched/core.c | 2 +-
kernel/workqueue.c | 2 +-
kernel/workqueue_internal.h | 18 ++++++++++++++++++
kernel/workqueue_sched.h | 9 ---------
4 files changed, 20 insertions(+), 11 deletions(-)
create mode 100644 kernel/workqueue_internal.h
delete mode 100644 kernel/workqueue_sched.h
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 257002c..c6737f4f 100644
--- a/kernel/sched/core.c
+++ b/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/kernel/workqueue.c b/kernel/workqueue.c
index 6b99ac7..b4e9206 100644
--- a/kernel/workqueue.c
+++ b/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/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
new file mode 100644
index 0000000..b3ea6ad
--- /dev/null
+++ b/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/kernel/workqueue_sched.h b/kernel/workqueue_sched.h
deleted file mode 100644
index 2d10fc9..0000000
--- a/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);
--
1.8.0.2
next prev parent reply other threads:[~2013-01-18 22:10 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 21:04 USB device cannot be reconnected and khubd "blocked for more than 120 seconds" Alex Riesen
2013-01-12 7:48 ` Alex Riesen
2013-01-12 9:18 ` Lan Tianyu
2013-01-12 17:37 ` Alan Stern
2013-01-12 19:39 ` Alex Riesen
2013-01-12 20:33 ` Alex Riesen
2013-01-12 22:52 ` Alan Stern
2013-01-13 12:09 ` Alex Riesen
2013-01-13 16:56 ` Alan Stern
2013-01-13 17:42 ` Alex Riesen
2013-01-13 19:16 ` Oliver Neukum
2013-01-14 2:39 ` Alan Stern
2013-01-14 16:43 ` Alex Riesen
2013-01-14 3:47 ` Ming Lei
2013-01-14 7:15 ` Ming Lei
2013-01-14 17:30 ` Linus Torvalds
2013-01-14 18:04 ` Alan Stern
2013-01-14 18:34 ` Linus Torvalds
2013-01-15 1:53 ` Ming Lei
2013-01-15 6:23 ` Ming Lei
2013-01-15 17:36 ` Linus Torvalds
2013-01-15 18:18 ` Linus Torvalds
2013-01-15 23:17 ` Tejun Heo
2013-01-15 18:20 ` Alan Stern
2013-01-15 18:39 ` Tejun Heo
2013-01-15 18:32 ` Tejun Heo
2013-01-15 20:18 ` Linus Torvalds
2013-01-15 23:50 ` Tejun Heo
2013-01-16 0:25 ` Arjan van de Ven
2013-01-16 0:35 ` Tejun Heo
2013-01-16 4:01 ` Alan Stern
2013-01-16 16:12 ` Tejun Heo
2013-01-16 17:01 ` Alan Stern
2013-01-16 17:37 ` Tejun Heo
2013-01-16 17:51 ` Alan Stern
2013-01-16 0:36 ` Linus Torvalds
2013-01-16 0:40 ` Linus Torvalds
2013-01-16 2:52 ` [PATCH] module, async: async_synchronize_full() on module init iff async is used Tejun Heo
2013-01-16 3:00 ` Linus Torvalds
2013-01-16 3:25 ` Tejun Heo
2013-01-16 3:37 ` Linus Torvalds
2013-01-16 16:22 ` Arjan van de Ven
2013-01-16 16:48 ` Tejun Heo
2013-01-16 17:03 ` Arjan van de Ven
2013-01-16 17:06 ` Linus Torvalds
2013-01-16 21:30 ` [PATCH 1/2] init, block: try to load default elevator module early during boot Tejun Heo
2013-01-17 18:05 ` Linus Torvalds
2013-01-17 18:38 ` Tejun Heo
2013-01-17 18:46 ` Linus Torvalds
2013-01-17 18:59 ` Tejun Heo
2013-01-17 19:00 ` Linus Torvalds
2013-01-18 1:24 ` [PATCH 1/3] workqueue: set PF_WQ_WORKER on rescuers Tejun Heo
2013-01-18 1:25 ` [PATCH 2/3] workqueue, async: implement work/async_current_func() Tejun Heo
2013-01-18 2:47 ` Linus Torvalds
2013-01-18 2:59 ` Tejun Heo
2013-01-18 3:04 ` Tejun Heo
2013-01-18 3:18 ` Linus Torvalds
2013-01-18 3:47 ` Tejun Heo
2013-01-18 22:08 ` [PATCH 1/5] workqueue: set PF_WQ_WORKER on rescuers Tejun Heo
2013-01-18 22:10 ` Tejun Heo [this message]
2013-01-18 22:11 ` [PATCH 3/5] workqueue: move struct worker definition to workqueue_internal.h Tejun Heo
2013-01-18 22:11 ` [PATCH 4/5] workqueue: implement current_is_async() Tejun Heo
2013-01-18 22:12 ` [PATCH 5/5] async, kmod: warn on synchronous request_module() from async workers Tejun Heo
2022-06-23 5:25 ` Saravana Kannan
2013-01-18 1:27 ` [PATCH 3/3] " Tejun Heo
2013-01-23 0:53 ` [PATCH v2 1/2] init, block: try to load default elevator module early during boot Tejun Heo
2013-01-16 21:31 ` [PATCH 2/2] block: don't request module during elevator init Tejun Heo
2013-01-23 0:51 ` [PATCH v2 " Tejun Heo
2013-01-16 3:30 ` [PATCH] module, async: async_synchronize_full() on module init iff async is used Ming Lei
2013-01-16 4:24 ` Rusty Russell
2013-01-16 11:36 ` Alex Riesen
2013-08-12 7:04 ` [3.8-rc3 -> 3.8-rc4 regression] " Jonathan Nieder
2013-08-12 15:09 ` Tejun Heo
2013-11-26 21:29 ` Josh Hunt
2013-11-26 21:53 ` Linus Torvalds
2013-11-26 22:12 ` Josh Hunt
2013-11-26 22:29 ` Tejun Heo
2013-12-03 14:28 ` Josh Hunt
2013-12-03 15:19 ` Tejun Heo
2013-12-04 23:01 ` Josh Hunt
2013-12-04 23:12 ` Tejun Heo
2013-11-26 22:30 ` Linus Torvalds
2013-01-16 0:44 ` USB device cannot be reconnected and khubd "blocked for more than 120 seconds" Tejun Heo
2013-01-16 17:19 ` [PATCH] async: fix __lowest_in_progress() Tejun Heo
2013-01-17 18:16 ` Linus Torvalds
2013-01-17 18:50 ` Tejun Heo
2013-01-23 0:15 ` [PATCH v2] " Tejun Heo
2013-01-23 0:22 ` Linus Torvalds
2013-01-16 3:05 ` USB device cannot be reconnected and khubd "blocked for more than 120 seconds" Ming Lei
2013-01-16 4:14 ` Linus Torvalds
2013-01-14 8:22 ` Oliver Neukum
2013-01-14 8:40 ` Ming Lei
2013-01-12 19:56 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130118221030.GD24579@htj.dyndns.org \
--to=tj@kernel.org \
--cc=arjan@linux.intel.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=raa.lkml@gmail.com \
--cc=rusty@rustcorp.com.au \
--cc=stern@rowland.harvard.edu \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).