diff --git a/kernel/src/services.rs b/kernel/src/services.rs index a7bf79fb0..b775056d4 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1936,6 +1936,16 @@ impl SystemServices { server.discard_messages_for_pid(target_pid); } } + + // Now that the server has been "Disconnected", free the server entry. + for server in self.servers.iter_mut() { + if let Some(server_inner) = server { + if server_inner.pid == target_pid { + *server = None; + } + } + } + let process = self.get_process_mut(target_pid)?; process.activate()?; let parent_pid = process.ppid; diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 3835dc07f..1a809e845 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -30,6 +30,7 @@ enum ExecutionType { NonBlocking, } +#[cfg(baremetal)] pub fn reset_switchto_caller() { unsafe { SWITCHTO_CALLER = None }; }