vmap no longer needs rcu_freed

3a046d90 · Silas Boyd-Wickizer · 7b2ffeaf · 3a046d90 · 3a046d90
--- a/include/vm.hh
+++ b/include/vm.hh
@@ -63,7 +63,7 @@ struct vma
 // An address space: a set of vmas plus h/w page table.
 // The elements of e[] are not ordered by address.
-struct vmap : public rcu_freed {
+struct vmap {
 #if VM_CRANGE
  struct crange cr;
 #endif
@@ -92,7 +92,6 @@ struct vmap : public rcu_freed {
  int copyout(uptr va, void *p, u64 len);
  int sbrk(ssize_t n, uptr *addr);
-  virtual void do_gc(void) { delete this; }
  uptr brk_;                    // Top of heap
 private:

--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -146,7 +146,6 @@ vmap::alloc(void)
 }
 vmap::vmap() : 
-  rcu_freed("vm"),
 #if VM_CRANGE
  cr(10),
 #endif
@@ -194,7 +193,7 @@ void
 vmap::decref()
 {
  if (--ref == 0)
-    gc_delayed(this);
+    delete this;
 }
 void