commit 548c210fbffdb008a80fa41ff0cb3965f185583d
author John David Anglin <dave@hiauly1.hia.nrc.ca> Sat Jun 11 14:42:06 2011 -0400
committer James Bottomley <JBottomley@Parallels.com> Fri Jul 29 18:46:14 2011 +0400
tree d7aee0a745cd014bcb1391bcc3889b5d03b4f974
parent d9ba5fe76d604514444b1ea0a19f38c6196a46e3

[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>

arch/parisc/include/asm/atomic.h

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 @@
 
 #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);