commit: 548c210fbffdb008a80fa41ff0cb3965f185583d
From: John David Anglin <d...@hiauly1.hia.nrc.ca>
Date: Sat, 11 Jun 2011 14:42:06 -0400
Subject: [PATCH] [PARISC] fix return type of __atomic64_add_return
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.ang...@nrc-cnrc.gc.ca>
Cc: sta...@kernel.org
Signed-off-by: James Bottomley <jbottom...@parallels.com>
---
arch/parisc/include/asm/atomic.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index f819559..26fd114 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -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);
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
