Merge pull request #100 from CTSRD-CHERI/for-upstream-static-pagemap-slabmap

Deconflate "pagemap"
2019-11-25 16:26:55 +00:00
parent 7faefbbb0e e870960655
commit 11923154e8
6 changed files with 286 additions and 235 deletions
--- a/src/mem/threadalloc.h
+++ b/src/mem/threadalloc.h
@@ -19,7 +19,7 @@ namespace snmalloc
   * required.  This avoids a branch on the fast path.
   */
  inline Alloc GlobalPlaceHolder(
-    default_memory_provider, SNMALLOC_DEFAULT_PAGEMAP(), nullptr, true);
+    default_memory_provider, SNMALLOC_DEFAULT_CHUNKMAP(), nullptr, true);

 #ifdef SNMALLOC_EXTERNAL_THREAD_ALLOC
  /**