diff options
| author | Al Viro | 2014-12-09 02:39:29 +0100 |
|---|---|---|
| committer | Al Viro | 2014-12-09 02:39:29 +0100 |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /arch/sparc/include/asm/atomic_32.h | |
| parent | Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | copy_from_iter_nocache() (diff) | |
| download | kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.gz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/sparc/include/asm/atomic_32.h')
| -rw-r--r-- | arch/sparc/include/asm/atomic_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h index 765c1776ec9f..0e69b7e7a439 100644 --- a/arch/sparc/include/asm/atomic_32.h +++ b/arch/sparc/include/asm/atomic_32.h @@ -22,7 +22,7 @@ int atomic_add_return(int, atomic_t *); int atomic_cmpxchg(atomic_t *, int, int); -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) +int atomic_xchg(atomic_t *, int); int __atomic_add_unless(atomic_t *, int, int); void atomic_set(atomic_t *, int); |