Commit 36293352 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

tools: Drop "atomic_" prefix from atomic test_and_set_bit()

Drop the "atomic_" prefix from tools' atomic_test_and_set_bit() to
match the kernel nomenclature where test_and_set_bit() is atomic,
and __test_and_set_bit() provides the non-atomic variant.
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20221119013450.2643007-9-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7f32a6cf
...@@ -71,10 +71,9 @@ static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new) ...@@ -71,10 +71,9 @@ static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new)
return cmpxchg(&v->counter, old, new); return cmpxchg(&v->counter, old, new);
} }
static inline int atomic_test_and_set_bit(long nr, unsigned long *addr) static inline int test_and_set_bit(long nr, unsigned long *addr)
{ {
GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(bts), *addr, "Ir", nr, "%0", "c"); GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(bts), *addr, "Ir", nr, "%0", "c");
} }
#endif /* _TOOLS_LINUX_ASM_X86_ATOMIC_H */ #endif /* _TOOLS_LINUX_ASM_X86_ATOMIC_H */
...@@ -70,7 +70,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int oldval, int newval) ...@@ -70,7 +70,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int oldval, int newval)
return cmpxchg(&(v)->counter, oldval, newval); return cmpxchg(&(v)->counter, oldval, newval);
} }
static inline int atomic_test_and_set_bit(long nr, unsigned long *addr) static inline int test_and_set_bit(long nr, unsigned long *addr)
{ {
unsigned long mask = BIT_MASK(nr); unsigned long mask = BIT_MASK(nr);
long old; long old;
......
...@@ -44,7 +44,7 @@ static struct ucall *ucall_alloc(void) ...@@ -44,7 +44,7 @@ static struct ucall *ucall_alloc(void)
GUEST_ASSERT(ucall_pool); GUEST_ASSERT(ucall_pool);
for (i = 0; i < KVM_MAX_VCPUS; ++i) { for (i = 0; i < KVM_MAX_VCPUS; ++i) {
if (!atomic_test_and_set_bit(i, ucall_pool->in_use)) { if (!test_and_set_bit(i, ucall_pool->in_use)) {
uc = &ucall_pool->ucalls[i]; uc = &ucall_pool->ucalls[i];
memset(uc->args, 0, sizeof(uc->args)); memset(uc->args, 0, sizeof(uc->args));
return uc; return uc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment