diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /arch/sparc/include/asm/atomic_32.h | |
| parent | 5b095e99928cc13332d364f7cca7a9ca684369b4 (diff) | |
| parent | 093a1468b6edb0e568be7311b8d2228d205702db (diff) | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
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); |