[PATCH] Phonet:fix build problem

[PATCH] Phonet:fix build problem

[Alexander Beregalov]

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 <a.beregalov@gmail.com>
---

 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:

Re: [PATCH] Phonet:fix build problem

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
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 <a.beregalov@gmail.com>

What platform hits this problem?

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

Re: [PATCH] Phonet:fix build problem

[Alexander Beregalov]

2009/3/22 David Miller <davem@davemloft.net>:
> From: Alexander Beregalov <a.beregalov@gmail.com>
> 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 <a.beregalov@gmail.com>
>
> What platform hits this problem?
>
> I think that platform's atomic_add() implementation should
> be fixed instead.

It is parisc, CC added.

Re: [PATCH] Phonet:fix build problem

[James Bottomley]

On Sun, 2009-03-22 at 03:19 +0300, Alexander Beregalov wrote:
> 2009/3/22 David Miller <davem@davemloft.net>:
> > From: Alexander Beregalov <a.beregalov@gmail.com>
> > 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 <a.beregalov@gmail.com>
> >
> > 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)))
 

Re: [PATCH] Phonet:fix build problem

[Kyle McMartin]

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.

Re: [PATCH] Phonet:fix build problem

[Kyle McMartin]

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

Re: [PATCH] Phonet:fix build problem

[James Bottomley]

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 <James.Bottomley@HansenPartnership.com>

James

Re: [PATCH] Phonet:fix build problem

[Kyle McMartin]

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 <James.Bottomley@HansenPartnership.com>
>

Thanks! Sorted.

cheers, Kyle