| Date | Fri, 12 Aug 2011 14:03:53 -0700 | From | Greg KH <> | Subject | [08/90] [PARISC] fix return type of __atomic64_add_return |
| |
3.0-stable review patch. If anyone has any objections, please let us know.
------------------
From: John David Anglin <dave@hiauly1.hia.nrc.ca>
commit 548c210fbffdb008a80fa41ff0cb3965f185583d upstream.
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> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- arch/parisc/include/asm/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -259,10 +259,10 @@ static __inline__ int atomic_add_unless( #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);
|