From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752499AbbKAQPQ (ORCPT ); Sun, 1 Nov 2015 11:15:16 -0500 Received: from ozlabs.org ([103.22.144.67]:50696 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbbKAQPN (ORCPT ); Sun, 1 Nov 2015 11:15:13 -0500 Date: Mon, 2 Nov 2015 03:15:08 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Oleg Nesterov , Markus Pargmann , Jens Axboe Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20151102031508.59636627@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, ¤t->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. I added this merge fix patch: From: Stephen Rothwell 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 --- 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, ¤t->blocked, &info); - } + if (signal_pending(current)) + kernel_dequeue_signal(NULL); return 0; } -- 2.6.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au