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

Oleg Nesterov
2015-11-01T17:30:31Z

On 11/02, Stephen Rothwell wrote:
>
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/block/nbd.c: In function 'nbd_thread_send':
> drivers/block/nbd.c:592:3: error: implicit declaration of function 'dequeue_signal_lock' [-Werror=implicit-function-declaration]
> dequeue_signal_lock(current, &current->blocked, &info);
> ^
>
> Caused by commit
>
> ffcb8dc55a97 ("signal: turn dequeue_signal_lock() into kernel_dequeue_signal()")
>
> interacting with commit
>
> dcc909d90ccd ("nbd: Add locking for tasks")
>
> from Linus' tree.

Yes, thanks, this should be fixed by

signal-turn-dequeue_signal_lock-into-kernel_dequeue_signal-fix.patch

in -mm tree,

> I added this merge fix patch:

the same as the patch above, thanks.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2015 03:04:27 +1100
> Subject: [PATCH] ndb: fix up for dequeue_signal_lock API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/block/nbd.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index 5101fd2aca77..93b3f99b6865 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -587,10 +587,8 @@ static int nbd_thread_send(void *data)
> spin_unlock_irqrestore(&nbd->tasks_lock, flags);
>
> /* Clear maybe pending signals */
> - if (signal_pending(current)) {
> - siginfo_t info;
> - dequeue_signal_lock(current, &current->blocked, &info);
> - }
> + if (signal_pending(current))
> + kernel_dequeue_signal(NULL);
>
> return 0;
> }
> --
> 2.6.1
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au