Messages in this thread Patch in this message | | | Date | Mon, 28 Oct 2013 20:24:42 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the tip tree |
| |
Hi all,
After merging the tip tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:
In file included from /scratch/sfr/next/include/linux/mmzone.h:9:0, from /scratch/sfr/next/include/linux/gfp.h:4, from /scratch/sfr/next/include/linux/kmod.h:22, from /scratch/sfr/next/include/linux/module.h:13, from /scratch/sfr/next/block/blk-mq.c:2: /scratch/sfr/next/block/blk-mq.c: In function 'blk_mq_queue_enter': /scratch/sfr/next/include/linux/wait.h:772:2: error: expected ';' before '__ret' __ret; \ ^ /scratch/sfr/next/block/blk-mq.c:108:8: note: in expansion of macro 'wait_event_interruptible_lock_irq' ret = wait_event_interruptible_lock_irq(q->mq_freeze_wq, ^ /scratch/sfr/next/block/blk-mq.c:108:6: error: void value not ignored as it ought to be ret = wait_event_interruptible_lock_irq(q->mq_freeze_wq, ^
Caused by commit 35a2af94c7ce ("sched/wait: Make the __wait_event*() interface more friendly").
Since this was also in next-20131025, I applied the following merge fix commit for today, please fix this in the tip tree.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 28 Oct 2013 20:19:27 +1100 Subject: [PATCH] sched/wait: fix missing semicolon
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/wait.h b/include/linux/wait.h index 7f8caa519128..fcc968087f05 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -768,7 +768,7 @@ do { \ int __ret = 0; \ if (!(condition)) \ __ret = __wait_event_interruptible_lock_irq(wq, \ - condition, lock,) \ + condition, lock,); \ __ret; \ }) -- 1.8.4.rc3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |