diff --git a/library/std/src/sys/hermit/mutex.rs b/library/std/src/sys/hermit/mutex.rs
index 1bf142ec683d..c3f88ada0f4b 100644
--- a/library/std/src/sys/hermit/mutex.rs
+++ b/library/std/src/sys/hermit/mutex.rs
@@ -35,7 +35,11 @@ struct SpinlockGuard<'a, T: ?Sized + 'a> {
 
 impl<T> Spinlock<T> {
     pub const fn new(user_data: T) -> Spinlock<T> {
-        SpinlockGuard { dequeue: &self.dequeue, data: &mut *self.data.get() }
+        Spinlock {
+           queue: AtomicUsize::new(0),
+           dequeue: AtomicUsize::new(1),
+	   data: UnsafeCell::new(user_data),
+        }
     }
 
     #[inline]