From 8be37ed439b102e02cb1836f42ae0ebaccf92ead Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 23 Nov 2021 13:52:44 -0500 Subject: [PATCH] kernel/smp: Avoid casting spinlocks, which are structures. The lock entry is the first thing in the struct, so this is a no-op change, but it is safer to do in case of changes, of course. Spinlocks have been structures for quite a long time, so this was probably just missed in the conversion. --- headers/private/kernel/smp.h | 4 ++-- src/system/kernel/smp.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/headers/private/kernel/smp.h b/headers/private/kernel/smp.h index d88e4206bc..b6fec7ad5e 100644 --- a/headers/private/kernel/smp.h +++ b/headers/private/kernel/smp.h @@ -182,7 +182,7 @@ CPUSet::IsEmpty() const static inline bool try_acquire_spinlock_inline(spinlock* lock) { - return atomic_get_and_set((int32*)lock, 1) == 0; + return atomic_get_and_set(&lock->lock, 1) == 0; } @@ -198,7 +198,7 @@ acquire_spinlock_inline(spinlock* lock) static inline void release_spinlock_inline(spinlock* lock) { - atomic_set((int32*)lock, 0); + atomic_set(&lock->lock, 0); } diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp index ed259d38ae..52d4002356 100644 --- a/src/system/kernel/smp.cpp +++ b/src/system/kernel/smp.cpp @@ -330,7 +330,7 @@ try_acquire_spinlock(spinlock* lock) if (atomic_add(&lock->lock, 1) != 0) return false; #else - if (atomic_get_and_set((int32*)lock, 1) != 0) + if (atomic_get_and_set(&lock->lock, 1) != 0) return false; # if DEBUG_SPINLOCKS