Merge branch 'dev' into dev-slice

2021-11-14 16:48:04 -08:00
parent 7cd5b22ca7 0560fc27c0
commit 5a1c3c8a4a
5 changed files with 15 additions and 2 deletions
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -311,6 +311,7 @@ typedef enum mi_option_e {
  mi_option_reset_decommits,
  mi_option_large_os_pages,         // implies eager commit
  mi_option_reserve_huge_os_pages,
+  mi_option_reserve_huge_os_pages_at,
  mi_option_reserve_os_memory,
  mi_option_segment_cache,
  mi_option_page_reset,