From a46a91cdb13ee599955d042780184071fb34db65 Mon Sep 17 00:00:00 2001 From: travis1829 Date: Thu, 21 Jan 2021 05:44:38 +0000 Subject: [PATCH] Change to mutable reference. --- kernel-rs/src/proc.rs | 4 ++-- kernel-rs/src/sleepablelock.rs | 4 ++-- kernel-rs/src/spinlock.rs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel-rs/src/proc.rs b/kernel-rs/src/proc.rs index 9b9f7a954..ce9442892 100644 --- a/kernel-rs/src/proc.rs +++ b/kernel-rs/src/proc.rs @@ -216,7 +216,7 @@ pub trait Waitable { /// `raw_release()` and `raw_acquire` must always be used as a pair. /// Use these only for temporarily releasing (and then acquiring) the lock. /// Also, do not access `self` until re-acquiring the lock with `raw_acquire()`. - unsafe fn raw_release(&self); + unsafe fn raw_release(&mut self); /// Acquires the inner `RawSpinlock`. /// @@ -224,7 +224,7 @@ pub trait Waitable { /// /// `raw_release()` and `raw_acquire` must always be used as a pair. /// Use these only for temporarily releasing (and then acquiring) the lock. - unsafe fn raw_acquire(&self); + unsafe fn raw_acquire(&mut self); } pub struct WaitChannel { diff --git a/kernel-rs/src/sleepablelock.rs b/kernel-rs/src/sleepablelock.rs index 2d8d6f0aa..65c51f40c 100644 --- a/kernel-rs/src/sleepablelock.rs +++ b/kernel-rs/src/sleepablelock.rs @@ -70,10 +70,10 @@ impl SleepablelockGuard<'_, T> { } impl Waitable for SleepablelockGuard<'_, T> { - unsafe fn raw_release(&self) { + unsafe fn raw_release(&mut self) { self.lock.lock.release(); } - unsafe fn raw_acquire(&self) { + unsafe fn raw_acquire(&mut self) { self.lock.lock.acquire(); } } diff --git a/kernel-rs/src/spinlock.rs b/kernel-rs/src/spinlock.rs index 2e5bb73f9..330931102 100644 --- a/kernel-rs/src/spinlock.rs +++ b/kernel-rs/src/spinlock.rs @@ -199,10 +199,10 @@ impl SpinlockGuard<'_, T> { } impl Waitable for SpinlockGuard<'_, T> { - unsafe fn raw_release(&self) { + unsafe fn raw_release(&mut self) { self.lock.lock.release(); } - unsafe fn raw_acquire(&self) { + unsafe fn raw_acquire(&mut self) { self.lock.lock.acquire(); } } @@ -268,10 +268,10 @@ impl SpinlockProtected { } impl Waitable for SpinlockProtectedGuard<'_> { - unsafe fn raw_release(&self) { + unsafe fn raw_release(&mut self) { self.lock.release(); } - unsafe fn raw_acquire(&self) { + unsafe fn raw_acquire(&mut self) { self.lock.acquire(); } }