From 7d3ebfc84700e4458af611ea9adb14be8292ceb9 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 1 Apr 2013 11:23:35 -0700
Subject: [PATCH] --- yaml --- r: 365548 b: refs/heads/master c:
 2728fd2f098c3cc5efaf3f0433855e579d5e4f28 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/workqueue.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3b4f4d3f656b..c82457a7c071 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecf6881ff349ad8670ec53a7586002d20b5f3b2e
+refs/heads/master: 2728fd2f098c3cc5efaf3f0433855e579d5e4f28
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index c8c5838c52c9..4c53fa216732 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -227,8 +227,6 @@ struct wq_device;
  * the appropriate worker_pool through its pool_workqueues.
  */
 struct workqueue_struct {
-	unsigned int		flags;		/* WQ: WQ_* flags */
-	struct pool_workqueue __percpu *cpu_pwqs; /* I: per-cpu pwq's */
 	struct list_head	pwqs;		/* WR: all pwqs of this wq */
 	struct list_head	list;		/* PL: list of all workqueues */
 
@@ -255,6 +253,10 @@ struct workqueue_struct {
 	struct lockdep_map	lockdep_map;
 #endif
 	char			name[WQ_NAME_LEN]; /* I: workqueue name */
+
+	/* hot fields used during command issue, aligned to cacheline */
+	unsigned int		flags ____cacheline_aligned; /* WQ: WQ_* flags */
+	struct pool_workqueue __percpu *cpu_pwqs; /* I: per-cpu pwqs */
 };
 
 static struct kmem_cache *pwq_cache;