ex: move vmem to ex

src/ex/init.zig

@@ -9,12 +9,14 @@ const exp = ex.private;
 const rtl = @import("rtl");
 
 pub fn init() void {
+    exp.vmem.init();
     mm.init();
     ps.init();
 
     pl.late_init();
     mm.late_init();
     ke.sched.late_init();
+
     exp.work.init() catch @panic("e");
     exp.string.init();
 

src/ex/private.zig

@@ -2,3 +2,4 @@ pub const init_mod = @import("init.zig");
 pub const work = @import("work.zig");
 pub const init = init_mod.init;
 pub const string = @import("string.zig");
+pub const vmem = @import("vmem.zig");

src/ex/root.zig

@@ -5,6 +5,7 @@ const p = private;
 pub const WorkItem = p.work.WorkItem;
 pub const DelayedWorkItem = p.work.DelayedWorkItem;
 pub const InternedString = p.string.InternedString;
+pub const Arena = p.vmem.Arena;
 
 pub const init = p.init;
 

src/ex/vmem.zig

@@ -561,7 +561,10 @@ pub const Arena = struct {
         options: AllocOptions,
     ) ?struct { usize, *Segment } {
         // Start from rotor if we have one, otherwise from the beginning.
-        const start_entry = if (self.rotor) |ro| ro.link.next else self.list.first();
+        const start_entry = if (self.rotor) |ro|
+            ro.link.next
+        else
+            self.list.first();
 
         // Search from rotor to end of list.
         var entry = start_entry;

src/mm/init.zig

@@ -7,7 +7,6 @@ const config = @import("config");
 pub fn init() linksection(r.init) void {
     mmp.phys.init();
     mmp.zone.early_init();
-    mmp.vmem.init();
     mmp.heap.init();
 }
 

src/mm/private.zig

@@ -2,7 +2,6 @@ const config = @import("config");
 pub const phys = @import("phys.zig");
 pub const pmap = @import("pmap.zig");
 pub const init = @import("init.zig");
-pub const vmem = @import("vmem.zig");
 pub const heap = @import("heap.zig");
 pub const zone = @import("zone.zig");
 pub const PMap = pmap.PMap;
@@ -10,10 +9,11 @@ pub const tlb = @import("tlb.zig");
 pub const balance = @import("balance.zig");
 
 const ke = @import("root").ke;
+const ex = @import("root").ex;
 
 pub const Space = struct {
     pmap: PMap,
-    arena: vmem.Arena,
+    arena: ex.Arena,
     lock: ke.Mutex,
 };