diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-09-29 08:57:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-09-29 08:57:18 +0200 |
| commit | ae39e0bd150bd2739582f72ad70b5a0b15e74576 (patch) | |
| tree | a880ea77d20f32b6a85b9d4bbb1b43198c7ef801 /arch/x86/include | |
| parent | jump_label: Fix static_key_slow_dec() yet again (diff) | |
| parent | locking/rwsem: Move is_rwsem_reader_owned() and rwsem_owner() under CONFIG_DE... (diff) | |
| download | linux-ae39e0bd150bd2739582f72ad70b5a0b15e74576.tar.xz linux-ae39e0bd150bd2739582f72ad70b5a0b15e74576.zip | |
Merge branch 'locking/core' into locking/urgent, to pick up pending commits
Merge all pending locking commits into a single branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/atomic64_32.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h index 8db2ec4d6cda..1f650b4dde50 100644 --- a/arch/x86/include/asm/atomic64_32.h +++ b/arch/x86/include/asm/atomic64_32.h @@ -163,20 +163,18 @@ static __always_inline s64 arch_atomic64_dec_return(atomic64_t *v) } #define arch_atomic64_dec_return arch_atomic64_dec_return -static __always_inline s64 arch_atomic64_add(s64 i, atomic64_t *v) +static __always_inline void arch_atomic64_add(s64 i, atomic64_t *v) { __alternative_atomic64(add, add_return, ASM_OUTPUT2("+A" (i), "+c" (v)), ASM_NO_INPUT_CLOBBER("memory")); - return i; } -static __always_inline s64 arch_atomic64_sub(s64 i, atomic64_t *v) +static __always_inline void arch_atomic64_sub(s64 i, atomic64_t *v) { __alternative_atomic64(sub, sub_return, ASM_OUTPUT2("+A" (i), "+c" (v)), ASM_NO_INPUT_CLOBBER("memory")); - return i; } static __always_inline void arch_atomic64_inc(atomic64_t *v) |