Skip to content

Commit

Permalink
[PARISC] fix return type of __atomic64_add_return
Browse files Browse the repository at this point in the history
The return type of __atomic64_add_return of should be s64 or long, not
int.  This fixes the atomic64 test failure that I previously reported.

Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
John David Anglin authored and James Bottomley committed Jul 29, 2011
1 parent d9ba5fe commit 548c210
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/parisc/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })

static __inline__ int
static __inline__ s64
__atomic64_add_return(s64 i, atomic64_t *v)
{
int ret;
s64 ret;
unsigned long flags;
_atomic_spin_lock_irqsave(v, flags);

Expand Down

0 comments on commit 548c210

Please sign in to comment.