2013-10-30 04:09:08

by Chen Gang

Subject: [PATCH] include/linux/wait.h: add ';' for the statement which missed it.

Add ';' for the statement, or can not pass compiling. The related error
(for powerpc allmodconfig):

CC block/blk-mq.o
block/blk-mq.c: In function ?blk_mq_queue_enter?:
block/blk-mq.c:108:8: error: expected ?;? before ?__ret?
block/blk-mq.c:108:6: error: void value not ignored as it ought to be


Signed-off-by: Chen Gang <[email protected]>
---
include/linux/wait.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/wait.h b/include/linux/wait.h
index 7f8caa5..fcc9680 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.7.7.6

2013-10-30 15:15:43

by Randy Dunlap

Subject: Re: [PATCH] include/linux/wait.h: add ';' for the statement which missed it.

On 10/29/13 21:08, Chen Gang wrote:
> Add ';' for the statement, or can not pass compiling. The related error
> (for powerpc allmodconfig):
>
> CC block/blk-mq.o
> block/blk-mq.c: In function ?blk_mq_queue_enter?:
> block/blk-mq.c:108:8: error: expected ?;? before ?__ret?
> block/blk-mq.c:108:6: error: void value not ignored as it ought to be
>
>
> Signed-off-by: Chen Gang <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

I have that same patch on my machine but never posted it.

Thanks.

> ---
> include/linux/wait.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/wait.h b/include/linux/wait.h
> index 7f8caa5..fcc9680 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; \
> })
>
>


--
~Randy

2013-10-30 15:40:26

by Peter Zijlstra

Subject: Re: [PATCH] include/linux/wait.h: add ';' for the statement which missed it.

On Wed, Oct 30, 2013 at 08:15:31AM -0700, Randy Dunlap wrote:
> On 10/29/13 21:08, Chen Gang wrote:
> > Add ';' for the statement, or can not pass compiling. The related error
> > (for powerpc allmodconfig):
> >
> > CC block/blk-mq.o
> > block/blk-mq.c: In function ‘blk_mq_queue_enter’:
> > block/blk-mq.c:108:8: error: expected ‘;’ before ‘__ret’
> > block/blk-mq.c:108:6: error: void value not ignored as it ought to be
> >
> >
> > Signed-off-by: Chen Gang <[email protected]>
>
> Acked-by: Randy Dunlap <[email protected]>
>
> I have that same patch on my machine but never posted it.

tip already includes commit 92ec11809565cf6429c75204e99e0f583b5c9d7c
from the 23th which should fix this.

2013-10-31 00:52:20

by Chen Gang

Subject: Re: [PATCH] include/linux/wait.h: add ';' for the statement which missed it.

On 10/30/2013 11:40 PM, Peter Zijlstra wrote:
> On Wed, Oct 30, 2013 at 08:15:31AM -0700, Randy Dunlap wrote:
>> On 10/29/13 21:08, Chen Gang wrote:
>>> Add ';' for the statement, or can not pass compiling. The related error
>>> (for powerpc allmodconfig):
>>>
>>> CC block/blk-mq.o
>>> block/blk-mq.c: In function ??blk_mq_queue_enter??:
>>> block/blk-mq.c:108:8: error: expected ??;?? before ??__ret??
>>> block/blk-mq.c:108:6: error: void value not ignored as it ought to be
>>>
>>>
>>> Signed-off-by: Chen Gang <[email protected]>
>>
>> Acked-by: Randy Dunlap <[email protected]>
>>
>> I have that same patch on my machine but never posted it.
>
> tip already includes commit 92ec11809565cf6429c75204e99e0f583b5c9d7c
> from the 23th which should fix this.
>
>

Thank all of you.
--
Chen Gang