diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 10:29:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 10:29:47 -0800 |
commit | 9830afca9273787f32e236ae5d0e4d3a378ae842 (patch) | |
tree | 0215da65d6d4e2021f2543e78b7518d48f6f6ead /arch/riscv/include/asm/atomic.h | |
parent | 30807ef2b76e01ea209fcad66a87e534ed1edb40 (diff) | |
parent | 9b9afe4a0ef149db2472f13d6fa3c705d2867c9c (diff) |
Merge tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
Pull RISC-V updates from Palmer Dabbelt:
"We don't have many patches for this merge window, probably because
everything has been a bit busy with the holidays and conferences. The
only big user-visible change is to move over to an SBI-based earlycon
instead of our arch-specific early printk support.
The only outstanding patch set I know of is the audit patch set, which
I've managed to make a mess of and will attempt to clean up"
* tag 'riscv-for-linus-4.21-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
RISC-V: Select GENERIC_SCHED_CLOCK for clocksource drivers
RISC-V: lib: minor asm cleanup
RISC-V: Update Kconfig to better handle CMDLINE
riscv: remove unused variable in ftrace
RISC-V: add of_node_put()
RISC-V: Fix of_node_* refcount
riscv, atomic: Add #define's for the atomic_{cmp,}xchg_*() variants
RISC-V: Remove EARLY_PRINTK support
RISC-V: defconfig: Enable RISC-V SBI earlycon support
Diffstat (limited to 'arch/riscv/include/asm/atomic.h')
-rw-r--r-- | arch/riscv/include/asm/atomic.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h index c452359c9cb8..93826771b616 100644 --- a/arch/riscv/include/asm/atomic.h +++ b/arch/riscv/include/asm/atomic.h @@ -303,6 +303,15 @@ c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n) \ ATOMIC_OPS() +#define atomic_xchg_relaxed atomic_xchg_relaxed +#define atomic_xchg_acquire atomic_xchg_acquire +#define atomic_xchg_release atomic_xchg_release +#define atomic_xchg atomic_xchg +#define atomic_cmpxchg_relaxed atomic_cmpxchg_relaxed +#define atomic_cmpxchg_acquire atomic_cmpxchg_acquire +#define atomic_cmpxchg_release atomic_cmpxchg_release +#define atomic_cmpxchg atomic_cmpxchg + #undef ATOMIC_OPS #undef ATOMIC_OP |