From 4f259e358915fc192785595f05889d29105f3a64 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 30 Nov 2021 18:03:34 -0700
Subject: [PATCH] Workaround for thread race conditions

---
 src/syscall/process.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index e1c5796..0176601 100644
--- a/src/syscall/process.rs
+++ b/src/syscall/process.rs
@@ -47,7 +47,7 @@ pub fn clone(flags: CloneFlags, stack_base: usize) -> Result<ContextId> {
         let ens;
         let umask;
         let sigmask;
-        let cpu_id_opt = None;
+        let mut cpu_id_opt = None;
         let arch;
         let vfork;
         let mut kfx_opt = None;
@@ -80,9 +80,10 @@ pub fn clone(flags: CloneFlags, stack_base: usize) -> Result<ContextId> {
             umask = context.umask;
 
             // Uncomment to disable threads on different CPUs
-            // if flags.contains(CLONE_VM) {
-            //     cpu_id_opt = context.cpu_id;
-            // }
+            //TODO: fix memory allocation races when this is removed
+            if flags.contains(CLONE_VM) {
+                cpu_id_opt = context.cpu_id;
+            }
 
             arch = context.arch.clone();