From 24146851352c5f73c89154328d0fbc9b0cf796d1 Mon Sep 17 00:00:00 2001 From: ChiChen <2531693734@qq.com> Date: Thu, 24 Aug 2023 21:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/src/libs/rwlock.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/src/libs/rwlock.rs b/kernel/src/libs/rwlock.rs index d6276a977..ad3edd32e 100644 --- a/kernel/src/libs/rwlock.rs +++ b/kernel/src/libs/rwlock.rs @@ -520,10 +520,7 @@ impl<'rwlock, T> Drop for RwLockWriteGuard<'rwlock, T> { self.inner .lock .fetch_and(!(WRITER | UPGRADED), Ordering::Release); - if let Some(_) = self.irq_guard { - // 自动 drop 包含的 irq_guard,恢复中断 - self.irq_guard = None; - } + self.irq_guard.take(); ProcessManager::current_pcb().preempt_enable(); } }