From bd1b251f703842094813949b6456c5a82d14cb52 Mon Sep 17 00:00:00 2001 From: vasilito Date: Sun, 19 Jul 2026 07:15:16 +0900 Subject: [PATCH] kernel: fix post-merge compile errors (import dedup + UnmapVec) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- src/event.rs | 2 +- src/scheme/proc.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/event.rs b/src/event.rs index 91c229d82f..66cd67fcd6 100644 --- a/src/event.rs +++ b/src/event.rs @@ -2,7 +2,7 @@ use alloc::sync::Arc; use core::sync::atomic::{AtomicUsize, Ordering}; use hashbrown::{hash_map::DefaultHashBuilder, HashMap}; use smallvec::SmallVec; -use syscall::{data::GlobalSchemes, EAGAIN, EINTR}; +use syscall::data::GlobalSchemes; use crate::{ context, diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs index 70a22550bf..c0bc3fcd2a 100644 --- a/src/scheme/proc.rs +++ b/src/scheme/proc.rs @@ -3,7 +3,7 @@ use crate::{ self, context::{HardBlockedReason, LockedFdTbl, SignalState}, 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, }, memory::{Page, VirtualAddress, PAGE_SIZE},