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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151101182645.GA32642@redhat.com>
Date:	Sun, 1 Nov 2015 19:26:46 +0100
From:	Oleg Nesterov <oleg@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Markus Pargmann <mpa@...gutronix.de>, Jens Axboe <axboe@...com>
Subject: Re: linux-next: build failure after merge of the akpm-current tree

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@...b.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@...b.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@...b.auug.org.au

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/