diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 16:18:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 16:18:26 -0800 |
| commit | 435e46f5d35dbe5ea745822db29f16e003fa07d7 (patch) | |
| tree | 535db9ee2e47395eca1ff2f160dd444357b156d1 /arch/sparc/include/asm/atomic_32.h | |
| parent | 0fbae13642fc35ba6a774e9f76d0c1946e8f5c35 (diff) | |
| parent | 5a2b59d3993e8ca4f7788a48a23e5cb303f26954 (diff) | |
| download | linux-435e46f5d35dbe5ea745822db29f16e003fa07d7.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
1) Fix NULL oops in Schizo PCI controller error handler.
2) Fix race between xchg and other operations on 32-bit sparc, from
Andreas Larsson.
3) swab*() helpers need a dummy memory input operand to show data flow
on 64-bit sparc.
4) Fix RCU warnings due to missing irq_{enter,exit}() around
generic_smp_call_function*() calls.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix constraints on swab helpers.
sparc32: Implement xchg and atomic_xchg using ATOMIC_HASH locks
sparc64: Do irq_{enter,exit}() around generic_smp_call_function*().
sparc64: Fix crashes in schizo_pcierr_intr_other().
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); |