From 07dd0fbd38a5b79f202301a157c0578ad4ccb93a Mon Sep 17 00:00:00 2001 From: Chuandong Li Date: Tue, 5 Dec 2023 23:48:15 +0800 Subject: [PATCH] Fix the misuse of spin::mutex --- .github/workflows/integration_test.yml | 2 +- framework/jinux-frame/src/task/task.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 6ae685f8..af27fe97 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -9,7 +9,7 @@ on: jobs: test: runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 30 container: jinuxdev/jinux:0.2.1 steps: - run: echo "Running in jinuxdev/jinux:0.2.1" diff --git a/framework/jinux-frame/src/task/task.rs b/framework/jinux-frame/src/task/task.rs index 69aa1076..a8d5bae7 100644 --- a/framework/jinux-frame/src/task/task.rs +++ b/framework/jinux-frame/src/task/task.rs @@ -2,10 +2,10 @@ use crate::arch::mm::PageTableFlags; use crate::config::{KERNEL_STACK_SIZE, PAGE_SIZE}; use crate::cpu::CpuSet; use crate::prelude::*; +use crate::sync::{Mutex, MutexGuard}; use crate::user::UserSpace; use crate::vm::page_table::KERNEL_PAGE_TABLE; use crate::vm::{VmAllocOptions, VmSegment}; -use spin::{Mutex, MutexGuard}; use intrusive_collections::intrusive_adapter; use intrusive_collections::LinkedListAtomicLink;