diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:36:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:36:20 (GMT) |
| commit | 455ce9d8410d381f56a1676449a723ca1985b369 (patch) | |
| tree | 05ab694a3529958cf917214cfa3dd47b09dc1a2b /arch/parisc/include/asm/atomic.h | |
| parent | 447e1363bc2cc80fa9205a51a4f86d83c35b54a4 (diff) | |
| parent | 205e9a2106b934ea39049bab28f0896c17a2cb30 (diff) | |
| download | linux-455ce9d8410d381f56a1676449a723ca1985b369.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] wire up sendmmsg syscall
[PARISC] fix return type of __atomic64_add_return
[PARISC] Fix futex support
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 b1dc71f..4054b31 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -258,10 +258,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); |