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