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

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

[Stephen Rothwell]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

kernel/workqueue.c: In function 'workqueue_init_early':
kernel/workqueue.c:5561:56: error: 'cpu_isolated_map' undeclared (first use in this function)
  cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map);
                                                        ^

Caused by commit

  b5149873a0c2 ("workqueue: respect isolated cpus when queueing an unbound work")

interacting with commit

  edb9382175c3 ("sched/isolation: Move isolcpus= handling to the housekeeping code")

from the tip tree.

I am not sure how to fix this, so I have reverted b5149873a0c2 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

On Thu, Nov 02, 2017 at 02:34:40PM +1100, Stephen Rothwell wrote:
> Hi Tejun,
> 
> After merging the workqueues tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> kernel/workqueue.c: In function 'workqueue_init_early':
> kernel/workqueue.c:5561:56: error: 'cpu_isolated_map' undeclared (first use in this function)
>   cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map);
>                                                         ^
> 
> Caused by commit
> 
>   b5149873a0c2 ("workqueue: respect isolated cpus when queueing an unbound work")
> 
> interacting with commit
> 
>   edb9382175c3 ("sched/isolation: Move isolcpus= handling to the housekeeping code")
> 
> from the tip tree.
> 
> I am not sure how to fix this, so I have reverted b5149873a0c2 for today.

I'm reverting it from my tree.  Tal, can you please spin up a new
patch against the sched branch?  Let's either route it through sched
branch or try again after the rc1.

Thanks.

-- 
tejun

[PATCH v3 1/2] main: kernel_start: move housekeeping_init() before workqueue_init_early()

[Tal Shorer]

This is needed in order to allow the unbound workqueue to take
housekeeping cpus into accounty

Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
---
 init/main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/init/main.c b/init/main.c
index 4610c99..af6ecd0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -591,6 +591,12 @@ asmlinkage __visible void __init start_kernel(void)
 	radix_tree_init();
 
 	/*
+	 * Set up housekeeping before setting up workqueues to allow the unbound
+	 * workqueue to take non-housekeeping into account.
+	 */
+	housekeeping_init();
+
+	/*
 	 * Allow workqueue creation and work item queueing/cancelling
 	 * early.  Work item execution depends on kthreads and starts after
 	 * workqueue_init().
@@ -607,7 +613,6 @@ asmlinkage __visible void __init start_kernel(void)
 	early_irq_init();
 	init_IRQ();
 	tick_init();
-	housekeeping_init();
 	rcu_init_nohz();
 	init_timers();
 	hrtimers_init();
-- 
2.7.4

[PATCH v3 2/2] workqueue: respect isolated cpus when queueing an unbound work

[Tal Shorer]

Initialize wq_unbound_cpumask to exclude cpus that were isolated by
the cmdline's isolcpus parameter.

Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
---
 kernel/workqueue.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 64d0edf..a355e9d 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -48,6 +48,7 @@
 #include <linux/nodemask.h>
 #include <linux/moduleparam.h>
 #include <linux/uaccess.h>
+#include <linux/sched/isolation.h>
 
 #include "workqueue_internal.h"
 
@@ -4980,6 +4981,10 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask)
 	if (!zalloc_cpumask_var(&saved_cpumask, GFP_KERNEL))
 		return -ENOMEM;
 
+	/*
+	 * Not excluding isolated cpus on purpose.
+	 * If the user wishes to include them, we allow that.
+	 */
 	cpumask_and(cpumask, cpumask, cpu_possible_mask);
 	if (!cpumask_empty(cpumask)) {
 		apply_wqattrs_lock();
@@ -5579,7 +5584,7 @@ int __init workqueue_init_early(void)
 	WARN_ON(__alignof__(struct pool_workqueue) < __alignof__(long long));
 
 	BUG_ON(!alloc_cpumask_var(&wq_unbound_cpumask, GFP_KERNEL));
-	cpumask_copy(wq_unbound_cpumask, cpu_possible_mask);
+	cpumask_copy(wq_unbound_cpumask, housekeeping_cpumask(HK_FLAG_DOMAIN));
 
 	pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC);
 
-- 
2.7.4

Re: [PATCH v3 2/2] workqueue: respect isolated cpus when queueing an unbound work

[Tejun Heo]

On Fri, Nov 03, 2017 at 05:27:50PM +0200, Tal Shorer wrote:
> Initialize wq_unbound_cpumask to exclude cpus that were isolated by
> the cmdline's isolcpus parameter.
> 
> Signed-off-by: Tal Shorer <tal.shorer@gmail.com>

Acked-by: Tejun Heo <tj@kernel.org>

Plese feel free to route with the prerequisite changes.  If not, I'll
apply them after the next -rc1 window.

Thanks.

-- 
tejun

Re: [PATCH v3 2/2] workqueue: respect isolated cpus when queueing an unbound work

[Tejun Heo]

On Fri, Nov 03, 2017 at 05:27:50PM +0200, Tal Shorer wrote:
> Initialize wq_unbound_cpumask to exclude cpus that were isolated by
> the cmdline's isolcpus parameter.
> 
> Signed-off-by: Tal Shorer <tal.shorer@gmail.com>

Applied 1-2 to wq/for-4.15-fixes.

Thanks.

-- 
tejun

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

[Stephen Rothwell]

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

Hi all,

After merging the workqueues tree, today's linux-next build (x86_64
allmodconfig) failed like this:

error[E0308]: mismatched types
   --> rust/kernel/lib.rs:204:9
    |
204 |           ptr.sub(offset) as *const $type
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
    |
   ::: rust/kernel/workqueue.rs:495:18
    |
495 |               ) -> *mut Self {
    |                    --------- expected `*mut ClosureWork<T>` because of return type
...
505 | / impl_has_work! {
506 | |     impl{T} HasWork<Self> for ClosureWork<T> { self.work }
507 | | }
    | |_- in this macro invocation
    |
    = note: expected raw pointer `*mut ClosureWork<T>`
               found raw pointer `*const ClosureWork<T>`
    = note: this error originates in the macro `$crate::container_of` which comes from the expansion of the macro `impl_has_work` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0308`.

Caused by commit

  345e029b561e ("rust: workqueue: remove HasWork::OFFSET")

I have used the workqueues tree from next-20250414 for today.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the workqueues tree

[Tamir Duberstein]

On Tue, Apr 15, 2025 at 12:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the workqueues tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> error[E0308]: mismatched types
>    --> rust/kernel/lib.rs:204:9
>     |
> 204 |           ptr.sub(offset) as *const $type
>     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
>     |
>    ::: rust/kernel/workqueue.rs:495:18
>     |
> 495 |               ) -> *mut Self {
>     |                    --------- expected `*mut ClosureWork<T>` because of return type
> ...
> 505 | / impl_has_work! {
> 506 | |     impl{T} HasWork<Self> for ClosureWork<T> { self.work }
> 507 | | }
>     | |_- in this macro invocation
>     |
>     = note: expected raw pointer `*mut ClosureWork<T>`
>                found raw pointer `*const ClosureWork<T>`
>     = note: this error originates in the macro `$crate::container_of` which comes from the expansion of the macro `impl_has_work` (in Nightly builds, run with -Z macro-backtrace for more info)
>
> error: aborting due to 1 previous error
>
> For more information about this error, try `rustc --explain E0308`.
>
> Caused by commit
>
>   345e029b561e ("rust: workqueue: remove HasWork::OFFSET")
>
> I have used the workqueues tree from next-20250414 for today.

HI Stephen, I believe Tejun plans to back this out. See
https://lore.kernel.org/all/CAJ-ks9k2FEfL4SWw3ThhhozAeHB=Ue9-_1pxb9XVPRR2E1Z+SQ@mail.gmail.com/.

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

On Tue, Apr 15, 2025 at 09:24:32AM -0400, Tamir Duberstein wrote:
> On Tue, Apr 15, 2025 at 12:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the workqueues tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > error[E0308]: mismatched types
> >    --> rust/kernel/lib.rs:204:9
> >     |
> > 204 |           ptr.sub(offset) as *const $type
> >     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
> >     |
> >    ::: rust/kernel/workqueue.rs:495:18
> >     |
> > 495 |               ) -> *mut Self {
> >     |                    --------- expected `*mut ClosureWork<T>` because of return type
> > ...
> > 505 | / impl_has_work! {
> > 506 | |     impl{T} HasWork<Self> for ClosureWork<T> { self.work }
> > 507 | | }
> >     | |_- in this macro invocation
> >     |
> >     = note: expected raw pointer `*mut ClosureWork<T>`
> >                found raw pointer `*const ClosureWork<T>`
> >     = note: this error originates in the macro `$crate::container_of` which comes from the expansion of the macro `impl_has_work` (in Nightly builds, run with -Z macro-backtrace for more info)
> >
> > error: aborting due to 1 previous error
> >
> > For more information about this error, try `rustc --explain E0308`.
> >
> > Caused by commit
> >
> >   345e029b561e ("rust: workqueue: remove HasWork::OFFSET")
> >
> > I have used the workqueues tree from next-20250414 for today.
> 
> HI Stephen, I believe Tejun plans to back this out. See
> https://lore.kernel.org/all/CAJ-ks9k2FEfL4SWw3ThhhozAeHB=Ue9-_1pxb9XVPRR2E1Z+SQ@mail.gmail.com/.

Yeah, sorry about that. It was in the tree only for a couple hours and then
got rewound, but we got a bit unfortunate with linux-next pulling. Should be
okay today.

Thanks.

-- 
tejun

Re: linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

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

Hi Tejun,

On Tue, 15 Apr 2025 04:59:13 -1000 Tejun Heo <tj@kernel.org> wrote:
>
> On Tue, Apr 15, 2025 at 09:24:32AM -0400, Tamir Duberstein wrote:
> > On Tue, Apr 15, 2025 at 12:01 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > After merging the workqueues tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > error[E0308]: mismatched types  
> > >    --> rust/kernel/lib.rs:204:9  
> > >     |
> > > 204 |           ptr.sub(offset) as *const $type
> > >     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
> > >     |
> > >    ::: rust/kernel/workqueue.rs:495:18
> > >     |
> > > 495 |               ) -> *mut Self {
> > >     |                    --------- expected `*mut ClosureWork<T>` because of return type
> > > ...
> > > 505 | / impl_has_work! {
> > > 506 | |     impl{T} HasWork<Self> for ClosureWork<T> { self.work }
> > > 507 | | }
> > >     | |_- in this macro invocation
> > >     |
> > >     = note: expected raw pointer `*mut ClosureWork<T>`
> > >                found raw pointer `*const ClosureWork<T>`
> > >     = note: this error originates in the macro `$crate::container_of` which comes from the expansion of the macro `impl_has_work` (in Nightly builds, run with -Z macro-backtrace for more info)
> > >
> > > error: aborting due to 1 previous error
> > >
> > > For more information about this error, try `rustc --explain E0308`.
> > >
> > > Caused by commit
> > >
> > >   345e029b561e ("rust: workqueue: remove HasWork::OFFSET")
> > >
> > > I have used the workqueues tree from next-20250414 for today.  
> > 
> > HI Stephen, I believe Tejun plans to back this out. See
> > https://lore.kernel.org/all/CAJ-ks9k2FEfL4SWw3ThhhozAeHB=Ue9-_1pxb9XVPRR2E1Z+SQ@mail.gmail.com/.  
> 
> Yeah, sorry about that. It was in the tree only for a couple hours and then
> got rewound, but we got a bit unfortunate with linux-next pulling. Should be
> okay today.

I am still seeing this failure.  Forgot to push out?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Thu, Apr 17, 2025 at 02:26:36PM +1000, Stephen Rothwell wrote:
...
> I am still seeing this failure.  Forgot to push out?

Hah, we might be seeing some caching problem.

  htejun@slm ~/o/wq (for-next)> git rev-list for-next \^master --oneline
  24cdab5787a0 workqueue: Better document teardown for delayed_work
  htejun@slm ~/o/wq (for-next)> git push git@gitolite.kernel.org:pub/scm/linux/kernel/git/tj/wq.git for-next:for-next
  Everything up-to-date
  htejun@slm ~/o/wq (for-next)> git fetch -f git@gitolite.kernel.org:pub/scm/linux/kernel/git/tj/wq.git for-next:tmp 
  htejun@slm ~/o/wq (for-next)> git rev-list tmp \^master --oneline
  24cdab5787a0 workqueue: Better document teardown for delayed_work
  htejun@slm ~/o/wq (for-next)> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-next:tmp2                                                    
  From https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
   * [new branch]                for-next   -> tmp2
  htejun@slm ~/o/wq (for-next)> git rev-list tmp2 \^master --oneline
  2762750ac5c6 workqueue: Better document teardown for delayed_work
  345e029b561e rust: workqueue: remove HasWork::OFFSET

Cc'ing helpdesk@kernel.org. Imma leave the tree as-is for debugging. The
tree only has a documentation patch, so it's fine to skip for linux-next for
now. I'll wait a couple days and if the problem doesn't get resolved, I'll
try to update the branch and see whether the stale cache clears.

Thanks.

-- 
tejun

Re: linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

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

Hi Tejun,

On Wed, 16 Apr 2025 20:15:15 -1000 Tejun Heo <tj@kernel.org> wrote:
>
> On Thu, Apr 17, 2025 at 02:26:36PM +1000, Stephen Rothwell wrote:
> ...
> > I am still seeing this failure.  Forgot to push out?  
> 
> Hah, we might be seeing some caching problem.
> 
>   htejun@slm ~/o/wq (for-next)> git rev-list for-next \^master --oneline
>   24cdab5787a0 workqueue: Better document teardown for delayed_work
>   htejun@slm ~/o/wq (for-next)> git push git@gitolite.kernel.org:pub/scm/linux/kernel/git/tj/wq.git for-next:for-next
>   Everything up-to-date
>   htejun@slm ~/o/wq (for-next)> git fetch -f git@gitolite.kernel.org:pub/scm/linux/kernel/git/tj/wq.git for-next:tmp 
>   htejun@slm ~/o/wq (for-next)> git rev-list tmp \^master --oneline
>   24cdab5787a0 workqueue: Better document teardown for delayed_work
>   htejun@slm ~/o/wq (for-next)> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-next:tmp2                                                    
>   From https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
>    * [new branch]                for-next   -> tmp2
>   htejun@slm ~/o/wq (for-next)> git rev-list tmp2 \^master --oneline
>   2762750ac5c6 workqueue: Better document teardown for delayed_work
>   345e029b561e rust: workqueue: remove HasWork::OFFSET
> 
> Cc'ing helpdesk@kernel.org. Imma leave the tree as-is for debugging. The
> tree only has a documentation patch, so it's fine to skip for linux-next for
> now. I'll wait a couple days and if the problem doesn't get resolved, I'll
> try to update the branch and see whether the stale cache clears.

Thanks for checking.  I have a few days off now, so I guess we will see
what it is like on (my) Tuesday.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi Tejun,

After merging the workqueues tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

kernel/workqueue.c: In function 'unbound_pwq_by_node':
kernel/workqueue.c:570:2: error: implicit declaration of function 'rcu_lockdep_assert' [-Werror=implicit-function-declaration]
  assert_rcu_or_wq_mutex_or_pool_mutex(wq);
  ^
kernel/workqueue.c:570:2: error: implicit declaration of function 'lockdep_is_held' [-Werror=implicit-function-declaration]

Caused by commit:

  5b95e1af8d17 ("workqueue: wq_pool_mutex protects the attrs-installation")

from the workqueues tree interacting with commit:

  eeacf8982637 ("rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()")

from the rcu tree.

I applied the followinf merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 20 Jun 2015 19:39:43 +1000
Subject: [PATCH] workqueue: fix up for rcu_lockdep_assert() rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/workqueue.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 837427cc5bdf..44cd4144ebcb 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -348,10 +348,10 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
 			 "sched RCU or wq->mutex should be held")
 
 #define assert_rcu_or_wq_mutex_or_pool_mutex(wq)			\
-	rcu_lockdep_assert(rcu_read_lock_sched_held() ||		\
-			   lockdep_is_held(&wq->mutex) ||		\
-			   lockdep_is_held(&wq_pool_mutex),		\
-			   "sched RCU, wq->mutex or wq_pool_mutex should be held")
+	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() &&		\
+			 !lockdep_is_held(&wq->mutex) &&		\
+			 !lockdep_is_held(&wq_pool_mutex),		\
+			 "sched RCU, wq->mutex or wq_pool_mutex should be held")
 
 #define for_each_cpu_worker_pool(pool, cpu)				\
 	for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0];		\
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

Hi Tejun,

After merging the workqueues tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/input/input-polldev.c: In function 'input_polldev_init':
drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)

Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
input-polldev - create workqueue upfront") from the input tree.

I applied the following fix up patch (and can carry it as necessary):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 18 Feb 2011 14:50:46 +1100
Subject: [PATCH] input: update for FREEZEABLE -> FREEZABLE change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/input-polldev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 0a5304c..d89e9a9 100644
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
@@ -257,7 +257,7 @@ static int __init input_polldev_init(void)
 	 * system goes into sleep mode.
 	 */
 	polldev_wq = alloc_workqueue("ipolldev_wq",
-				     WQ_FREEZEABLE | WQ_UNBOUND, 0);
+				     WQ_FREEZABLE | WQ_UNBOUND, 0);
 	if (!polldev_wq) {
 		pr_err("failed to create ipolldev_wq workqueue\n");
 		return -ENOMEM;
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Fri, Feb 18, 2011 at 02:57:47PM +1100, Stephen Rothwell wrote:
> drivers/input/input-polldev.c: In function 'input_polldev_init':
> drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> 
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> input-polldev - create workqueue upfront") from the input tree.
> 
> I applied the following fix up patch (and can carry it as necessary):

Yeah, looks good to me.  I already sent pull request for the rename to
Linus so once it gets pulled, Dmitry should be able to pull in the
mainline and resolve the conflict there.

Thank you.

-- 
tejun

Re: linux-next: build failure after merge of the workqueues tree

[Stephen Rothwell]

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

Hi Dmitry,

On Fri, 18 Feb 2011 14:57:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the workqueues tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/input-polldev.c: In function 'input_polldev_init':
> drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> 
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> input-polldev - create workqueue upfront") from the input tree.
> 
> I applied the following fix up patch (and can carry it as necessary):

This patch is now applicable after the input tree merge as the workqueues
patch has been merged into Linus' tree.  So, Dmitry, if you merge Linus'
tree sometime, you should apply this merge fixup.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 18 Feb 2011 14:50:46 +1100
> Subject: [PATCH] input: update for FREEZEABLE -> FREEZABLE change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/input/input-polldev.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
> index 0a5304c..d89e9a9 100644
> --- a/drivers/input/input-polldev.c
> +++ b/drivers/input/input-polldev.c
> @@ -257,7 +257,7 @@ static int __init input_polldev_init(void)
>  	 * system goes into sleep mode.
>  	 */
>  	polldev_wq = alloc_workqueue("ipolldev_wq",
> -				     WQ_FREEZEABLE | WQ_UNBOUND, 0);
> +				     WQ_FREEZABLE | WQ_UNBOUND, 0);
>  	if (!polldev_wq) {
>  		pr_err("failed to create ipolldev_wq workqueue\n");
>  		return -ENOMEM;
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the workqueues tree

[Dmitry Torokhov]

Hi Stephen,

On Mon, Feb 21, 2011 at 01:27:08PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> On Fri, 18 Feb 2011 14:57:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the workqueues tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/input/input-polldev.c: In function 'input_polldev_init':
> > drivers/input/input-polldev.c:259: error: 'WQ_FREEZEABLE' undeclared (first use in this function)
> > 
> > Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> > freezer: unify spelling of 'freeze' + 'able' to 'freezable'") interacting
> > with commit 8fb3f6f6bf6e17e97712d216f230ba05f2e88ed8 ("Input:
> > input-polldev - create workqueue upfront") from the input tree.
> > 
> > I applied the following fix up patch (and can carry it as necessary):
> 
> This patch is now applicable after the input tree merge as the workqueues
> patch has been merged into Linus' tree.  So, Dmitry, if you merge Linus'
> tree sometime, you should apply this merge fixup.
> 

Actually I will just pull the patch and wait till Tejun's patch
introducing global freezable workqueue hits mainline and convert
input_polldev to use it.

Thanks.

-- 
Dmitry

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

[Stephen Rothwell]

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

Hi Tejun,

After merging the workqueues tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/workqueue.c: In function 'init_workqueues':
kernel/workqueue.c:3780: error: 'WQ_FREEZEABLE' undeclared (first use in this function)

Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
freezer: unify spelling of 'freeze' + 'able' to 'freezable'") being
mismerged with commit 4149efb22da66e326fc48baf80d628834509f7f0
("workqueue: add system_freezeable_wq") which added another use of
WQ_FREEZEABLE.

Please do at least simple build testing before submitting to
linux-next ...

I have used the version of the workqueues tree from next-20110216 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Thu, Feb 17, 2011 at 02:33:21PM +1100, Stephen Rothwell wrote:
> Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue,
> freezer: unify spelling of 'freeze' + 'able' to 'freezable'") being
> mismerged with commit 4149efb22da66e326fc48baf80d628834509f7f0
> ("workqueue: add system_freezeable_wq") which added another use of
> WQ_FREEZEABLE.
> 
> Please do at least simple build testing before submitting to
> linux-next ...

Yeap, please feel free to call me an idiot.  After verifying the
original branch, I completely forgot merge could introduce this type
of silent conflicts.  I apologize for the late screwups.

Thank you.

-- 
tejun

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

[Stephen Rothwell]

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

Hi Tejun,

After merging the workqueues tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/built-in.o:(.toc1+0x14c0): undefined reference to `system_freezeable_wq'

Caused by commit de62c151df9b6568c67977920267392c432f340a ("workqueue:
add system_freezeable_wq").

I have used the workqueues tree from next-20110208 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the workqueues tree

[Tejun Heo]

Hello,

On Wed, Feb 09, 2011 at 03:12:04PM +1100, Stephen Rothwell wrote:
> After merging the workqueues tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> kernel/built-in.o:(.toc1+0x14c0): undefined reference to `system_freezeable_wq'
> 
> Caused by commit de62c151df9b6568c67977920267392c432f340a ("workqueue:
> add system_freezeable_wq").
> 
> I have used the workqueues tree from next-20110208 for today.

That was embarrassing.  Sorry.  Updated.

-- 
tejun