fix rebase conflicts

anubis-rs · Sep 18, 2024 · 7cb71f8 · 7cb71f8
1 parent cf4ab2b
commit 7cb71f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/kernel/src/fs/vfs.rs b/kernel/src/fs/vfs.rs
@@ -6,13 +6,12 @@ use alloc::{
 };
 use libxernel::boot::InitAtBoot;
 use libxernel::sync::Spinlock;
-use libxernel::boot::InitAtBoot;
 
 use super::{
     mount::{Mount, VfsOps},
     pathbuf::PathBuf,
     tmpfs::Tmpfs,
-    vnode::{VNode, VNodeOperations},
+    vnode::VNode,
     {Error, Result},
 };
 

diff --git a/kernel/src/sched/process.rs b/kernel/src/sched/process.rs
@@ -32,7 +32,6 @@ pub struct Process {
     pub children: Vec<Arc<Spinlock<Process>>>,
     pub threads: Vec<Arc<Spinlock<Thread>>>,
     pub fds: BTreeMap<usize, File>,
-    pub is_kernel_process: bool,
     pub kernel_thread_stack_top: usize,
     pub thread_id_counter: usize,
     pub vm: Vm,