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

[Stephen Rothwell]

Hi Dmitry,

On Fri, 18 Feb 2011 14:57:47 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> Date: Fri, 18 Feb 2011 14:50:46 +1100
> Subject: [PATCH] input: update for FREEZEABLE -> FREEZABLE change
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature