aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJohn David Anglin <dave@hiauly1.hia.nrc.ca>2011-06-11 14:42:06 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-07-29 10:46:14 -0400
commit548c210fbffdb008a80fa41ff0cb3965f185583d (patch)
treed7aee0a745cd014bcb1391bcc3889b5d03b4f974 /arch
parentd9ba5fe76d604514444b1ea0a19f38c6196a46e3 (diff)
[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.anglin@nrc-cnrc.gc.ca> Cc: stable@kernel.org Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/include/asm/atomic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index f81955934aeb..26fd1146dda6 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)
259 259
260#define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) 260#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
261 261
262static __inline__ int 262static __inline__ s64
263__atomic64_add_return(s64 i, atomic64_t *v) 263__atomic64_add_return(s64 i, atomic64_t *v)
264{ 264{
265 int ret; 265 s64 ret;
266 unsigned long flags; 266 unsigned long flags;
267 _atomic_spin_lock_irqsave(v, flags); 267 _atomic_spin_lock_irqsave(v, flags);
268 268