2009-03-20 11:59:06

by Alexander Beregalov

[permalink] [raw]
Subject: [PATCH] Phonet:fix build problem

net/phonet/pep.c: In function 'pipe_rcv_status':
net/phonet/pep.c:262: error: lvalue required as left operand of assignment

Signed-off-by: Alexander Beregalov <[email protected]>
---

net/phonet/pep.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index 8ad2b53..9a1aefa 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -259,7 +259,8 @@ static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb)
case PN_PEP_IND_ID_MCFC_GRANT_CREDITS:
if (pn->tx_fc != PN_MULTI_CREDIT_FLOW_CONTROL)
break;
- atomic_add(wake = hdr->data[4], &pn->tx_credits);
+ wake = hdr->data[4];
+ atomic_add(wake, &pn->tx_credits);
break;

default:


2009-03-22 00:00:26

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

From: Alexander Beregalov <[email protected]>
Date: Fri, 20 Mar 2009 14:58:38 +0300

> net/phonet/pep.c: In function 'pipe_rcv_status':
> net/phonet/pep.c:262: error: lvalue required as left operand of assignment
>
> Signed-off-by: Alexander Beregalov <[email protected]>

What platform hits this problem?

I think that platform's atomic_add() implementation should
be fixed instead.

2009-03-22 00:19:43

by Alexander Beregalov

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

2009/3/22 David Miller <[email protected]>:
> From: Alexander Beregalov <[email protected]>
> Date: Fri, 20 Mar 2009 14:58:38 +0300
>
>> net/phonet/pep.c: In function 'pipe_rcv_status':
>> net/phonet/pep.c:262: error: lvalue required as left operand of assignment
>>
>> Signed-off-by: Alexander Beregalov <[email protected]>
>
> What platform hits this problem?
>
> I think that platform's atomic_add() implementation should
> be fixed instead.

It is parisc, CC added.

2009-03-22 03:58:57

by James Bottomley

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

On Sun, 2009-03-22 at 03:19 +0300, Alexander Beregalov wrote:
> 2009/3/22 David Miller <[email protected]>:
> > From: Alexander Beregalov <[email protected]>
> > Date: Fri, 20 Mar 2009 14:58:38 +0300
> >
> >> net/phonet/pep.c: In function 'pipe_rcv_status':
> >> net/phonet/pep.c:262: error: lvalue required as left operand of assignment
> >>
> >> Signed-off-by: Alexander Beregalov <[email protected]>
> >
> > What platform hits this problem?
> >
> > I think that platform's atomic_add() implementation should
> > be fixed instead.
>
> It is parisc, CC added.

Looks like a macro argument screw up in atomic.h

This should fix it (uncompiled, of course).

James

---

diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index edbfe25..ada3e53 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -25,7 +25,7 @@
* Since "a" is usually an address, use one spinlock per cacheline.
*/
# define ATOMIC_HASH_SIZE 4
-# define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))
+# define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) (a))/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))

extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;

@@ -222,13 +222,13 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)

-#define atomic_add(i,v) ((void)(__atomic_add_return( ((int)i),(v))))
-#define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)i),(v))))
+#define atomic_add(i,v) ((void)(__atomic_add_return( ((int)(i)),(v))))
+#define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)(i)),(v))))
#define atomic_inc(v) ((void)(__atomic_add_return( 1,(v))))
#define atomic_dec(v) ((void)(__atomic_add_return( -1,(v))))

-#define atomic_add_return(i,v) (__atomic_add_return( ((int)i),(v)))
-#define atomic_sub_return(i,v) (__atomic_add_return(-((int)i),(v)))
+#define atomic_add_return(i,v) (__atomic_add_return( ((int)(i)),(v)))
+#define atomic_sub_return(i,v) (__atomic_add_return(-((int)(i)),(v)))
#define atomic_inc_return(v) (__atomic_add_return( 1,(v)))
#define atomic_dec_return(v) (__atomic_add_return( -1,(v)))

@@ -289,13 +289,13 @@ atomic64_read(const atomic64_t *v)
return v->counter;
}

-#define atomic64_add(i,v) ((void)(__atomic64_add_return( ((s64)i),(v))))
-#define atomic64_sub(i,v) ((void)(__atomic64_add_return(-((s64)i),(v))))
+#define atomic64_add(i,v) ((void)(__atomic64_add_return( ((s64)(i)),(v))))
+#define atomic64_sub(i,v) ((void)(__atomic64_add_return(-((s64)(i)),(v))))
#define atomic64_inc(v) ((void)(__atomic64_add_return( 1,(v))))
#define atomic64_dec(v) ((void)(__atomic64_add_return( -1,(v))))

-#define atomic64_add_return(i,v) (__atomic64_add_return( ((s64)i),(v)))
-#define atomic64_sub_return(i,v) (__atomic64_add_return(-((s64)i),(v)))
+#define atomic64_add_return(i,v) (__atomic64_add_return( ((s64)(i)),(v)))
+#define atomic64_sub_return(i,v) (__atomic64_add_return(-((s64)(i)),(v)))
#define atomic64_inc_return(v) (__atomic64_add_return( 1,(v)))
#define atomic64_dec_return(v) (__atomic64_add_return( -1,(v)))


2009-03-22 16:06:55

by Kyle McMartin

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

On Sun, Mar 22, 2009 at 03:58:40AM +0000, James Bottomley wrote:
> > > I think that platform's atomic_add() implementation should
> > > be fixed instead.
> >
> > It is parisc, CC added.
>
> Looks like a macro argument screw up in atomic.h
>
> This should fix it (uncompiled, of course).
>

Looks correct to me. Applied. Thanks everyone.

2009-03-31 02:41:48

by Kyle McMartin

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

On Sun, Mar 22, 2009 at 12:06:29PM -0400, Kyle McMartin wrote:
> On Sun, Mar 22, 2009 at 03:58:40AM +0000, James Bottomley wrote:
> > > > I think that platform's atomic_add() implementation should
> > > > be fixed instead.
> > >
> > > It is parisc, CC added.
> >
> > Looks like a macro argument screw up in atomic.h
> >
> > This should fix it (uncompiled, of course).
> >
>
> Looks correct to me. Applied. Thanks everyone.
>

Oh, bah, want to resend that with a sign-off, James?

regards, Kyle

2009-03-31 03:08:20

by Kyle McMartin

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

On Mon, Mar 30, 2009 at 10:06:16PM -0500, James Bottomley wrote:
> On Mon, 2009-03-30 at 22:41 -0400, Kyle McMartin wrote:
> > On Sun, Mar 22, 2009 at 12:06:29PM -0400, Kyle McMartin wrote:
> > > On Sun, Mar 22, 2009 at 03:58:40AM +0000, James Bottomley wrote:
> > > > > > I think that platform's atomic_add() implementation should
> > > > > > be fixed instead.
> > > > >
> > > > > It is parisc, CC added.
> > > >
> > > > Looks like a macro argument screw up in atomic.h
> > > >
> > > > This should fix it (uncompiled, of course).
> > > >
> > >
> > > Looks correct to me. Applied. Thanks everyone.
> > >
> >
> > Oh, bah, want to resend that with a sign-off, James?
>
> You can add:
>
> Signed-off-by: James Bottomley <[email protected]>
>

Thanks! Sorted.

cheers, Kyle

2009-03-31 03:12:55

by James Bottomley

[permalink] [raw]
Subject: Re: [PATCH] Phonet:fix build problem

On Mon, 2009-03-30 at 22:41 -0400, Kyle McMartin wrote:
> On Sun, Mar 22, 2009 at 12:06:29PM -0400, Kyle McMartin wrote:
> > On Sun, Mar 22, 2009 at 03:58:40AM +0000, James Bottomley wrote:
> > > > > I think that platform's atomic_add() implementation should
> > > > > be fixed instead.
> > > >
> > > > It is parisc, CC added.
> > >
> > > Looks like a macro argument screw up in atomic.h
> > >
> > > This should fix it (uncompiled, of course).
> > >
> >
> > Looks correct to me. Applied. Thanks everyone.
> >
>
> Oh, bah, want to resend that with a sign-off, James?

You can add:

Signed-off-by: James Bottomley <[email protected]>

James