linux-next: build warning after merge of the workqueues tree

linux-next: build warning after merge of the workqueues tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (powerpc
allnoconfig) produced this warning:

kernel/workqueue.c:260:13: warning: 'workqueue_freezing' defined but not used [-Wunused-variable]

Introduced by commit 699ce097efe8 ("workqueue: implement and use
pwq_adjust_max_active()").  This build does not have CONFIG_FREEZER set.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH wq/for-3.10] workqueue: define workqueue_freezing static variable iff CONFIG_FREEZER

[Tejun Heo]

>From a0265a7f5161b6cb55e82b71edb236bbe0d9b3ae Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 19 Mar 2013 13:55:42 -0700

699ce097efe ("workqueue: implement and use pwq_adjust_max_active()")
replaced the only workqueue_freezing usage outside freezer callbacks
with a POOL_FREEZING test.  This makes workqueue_freezing unused when
!CONFIG_FREEZER leading to a compiler warning.  Define
workqueue_freezing iff CONFIG_FREEZER.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---
 kernel/workqueue.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index e38d035..775c2f4 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -261,7 +261,9 @@ static DEFINE_SPINLOCK(pwq_lock);	/* protects pool_workqueues */
 static DEFINE_SPINLOCK(wq_mayday_lock);	/* protects wq->maydays list */
 
 static LIST_HEAD(workqueues);		/* WQ: list of all workqueues */
+#ifdef CONFIG_FREEZER
 static bool workqueue_freezing;		/* WQ: have wqs started freezing? */
+#endif
 
 /* the per-cpu worker pools */
 static DEFINE_PER_CPU_SHARED_ALIGNED(struct worker_pool [NR_STD_WORKER_POOLS],
-- 
1.8.1.4