diff options
| author | John David Anglin <dave@hiauly1.hia.nrc.ca> | 2011-06-11 14:42:06 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:32 -0700 |
| commit | d4cf3443f9b390ae5b076a902059db190e980186 (patch) | |
| tree | b2032543a53fd60afa0a48f279bad4847e47cfbc /arch/parisc/include/asm/atomic.h | |
| parent | ec36ea64e4b31f4eba07f75bcce0a6124923d733 (diff) | |
| download | kernel_samsung_smdk4412-d4cf3443f9b390ae5b076a902059db190e980186.tar.gz kernel_samsung_smdk4412-d4cf3443f9b390ae5b076a902059db190e980186.tar.bz2 kernel_samsung_smdk4412-d4cf3443f9b390ae5b076a902059db190e980186.zip | |
fix return type of __atomic64_add_return
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>
Diffstat (limited to 'arch/parisc/include/asm/atomic.h')
| -rw-r--r-- | 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 f81955934ae..26fd1146dda 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); |