Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1260193

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

Show all headers | View raw

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.

I added this merge fix patch:

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the akpm-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-01 17:20 +0100
  Re: linux-next: build failure after merge of the akpm-current tree kbuild test robot <lkp@intel.com> - 2015-11-01 17:30 +0100
    Re: linux-next: build failure after merge of the akpm-current tree Oleg Nesterov <oleg@redhat.com> - 2015-11-01 18:50 +0100
      Re: [kbuild-all] linux-next: build failure after merge of the  akpm-current tree Fengguang Wu <lkp@intel.com> - 2015-11-02 03:50 +0100
  Re: linux-next: build failure after merge of the akpm-current tree Oleg Nesterov <oleg@redhat.com> - 2015-11-01 18:40 +0100
    Re: linux-next: build failure after merge of the akpm-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-01 22:50 +0100

csiph-web