kernel: fix post-merge compile errors (import dedup + UnmapVec)
Two fixes required for the merged tree to compile (repo cook kernel --force-rebuild passes with them): - event.rs: drop EAGAIN/EINTR from the top-level syscall import — the crate::syscall::error import further down already brings both names into scope (E0252 duplicate-definition). - scheme/proc.rs: drop UnmapVec from the context::memory import — the fork deleted that machinery from context/memory.rs (E0432 unresolved import); the type's only use site is the import itself.
This commit is contained in:
+1
-1
@@ -2,7 +2,7 @@ use alloc::sync::Arc;
|
|||||||
use core::sync::atomic::{AtomicUsize, Ordering};
|
use core::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use hashbrown::{hash_map::DefaultHashBuilder, HashMap};
|
use hashbrown::{hash_map::DefaultHashBuilder, HashMap};
|
||||||
use smallvec::SmallVec;
|
use smallvec::SmallVec;
|
||||||
use syscall::{data::GlobalSchemes, EAGAIN, EINTR};
|
use syscall::data::GlobalSchemes;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
context,
|
context,
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ use crate::{
|
|||||||
self,
|
self,
|
||||||
context::{HardBlockedReason, LockedFdTbl, SignalState},
|
context::{HardBlockedReason, LockedFdTbl, SignalState},
|
||||||
file::InternalFlags,
|
file::InternalFlags,
|
||||||
memory::{handle_notify_files, AddrSpace, AddrSpaceWrapper, Grant, PageSpan, UnmapVec},
|
memory::{handle_notify_files, AddrSpace, AddrSpaceWrapper, Grant, PageSpan},
|
||||||
unblock_context, wakeup_context, Context, ContextLock, Status,
|
unblock_context, wakeup_context, Context, ContextLock, Status,
|
||||||
},
|
},
|
||||||
memory::{Page, VirtualAddress, PAGE_SIZE},
|
memory::{Page, VirtualAddress, PAGE_SIZE},
|
||||||
|
|||||||
Reference in New Issue
Block a user