DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-19 04:56:30 +00:00
Code Issues Releases Wiki Activity

fix arch_try_cmpxchg macro declaration (#307)

Browse Source 
fix arch_try_cmpxchg in atomic_cmpxchg

Co-authored-by: Yao Zhao <dragonlinux@gmail.com>
This commit is contained in:
zhaoyao73
2023-07-28 03:44:45 -04:00
committed by GitHub
parent a30434f520
commit 7cc4a02c7f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/arch/x86_64/include/asm/cmpxchg.h
View File

@ -77,7 +77,7 @@ extern void __cmpxchg_wrong_size(void) __compiletime_error("Bad argument size fo
likely(is_success); \ likely(is_success); \
}) })
#define arch_try_cmpxchg(ptr, old_ptr, new_ptr) \ #define arch_try_cmpxchg(ptr, old_ptr, new) \
__raw_try_cmpxchg((ptr), (old_ptr), (new_ptr), sizeof(*ptr)) __raw_try_cmpxchg((ptr), (old_ptr), (new), sizeof(*ptr))
bool __try_cmpxchg_q(uint64_t *ptr, uint64_t *old_ptr, uint64_t *new_ptr); bool __try_cmpxchg_q(uint64_t *ptr, uint64_t *old_ptr, uint64_t *new_ptr);

4
kernel/src/common/atomic.h
View File

@ -102,6 +102,6 @@ inline void atomic_clear_mask(atomic_t *ato, long mask)
// cmpxchgq 比较并交换 // cmpxchgq 比较并交换
inline long atomic_cmpxchg(atomic_t *ato, long oldval, long newval) inline long atomic_cmpxchg(atomic_t *ato, long oldval, long newval)
{ {
bool success = arch_try_cmpxchg(&ato->value, &oldval, &newval); bool success = arch_try_cmpxchg(&ato->value, &oldval, newval);
return success ? oldval : newval; return success ? oldval : newval;
} }