- Add a statically allocated memguard arena since it is needed very early

   on.
 - Pass the appropriate flags to vmem_xalloc() when allocating space for
   the arena from kmem_arena.

Sponsored by:	EMC / Isilon Storage Division

1 files changed, 7 insertions, 0 deletions

diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c
index d3a758d..cff28b7 100644
--- a/sys/kern/subr_vmem.c
+++ b/sys/kern/subr_vmem.c
@@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 #include <sys/vmem.h>
 
+#include "opt_vm.h"
+
 #include <vm/uma.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -223,6 +225,11 @@ vmem_t *kmem_arena = &kmem_arena_storage;
 vmem_t *buffer_arena = &buffer_arena_storage;
 vmem_t *transient_arena = &transient_arena_storage;
 
+#ifdef DEBUG_MEMGUARD
+static struct vmem memguard_arena_storage;
+vmem_t *memguard_arena = &memguard_arena_storage;
+#endif
+
 /*
  * Fill the vmem's boundary tag cache.  We guarantee that boundary tag
  * allocation will not fail once bt_fill() passes.  To do so we cache