From 87384c51e047349fdbcf4f07fe52d900ce108040 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 15 Sep 2022 12:59:42 +0300
Subject: [PATCH] jemalloc: use symbolic definitions for bits in vm_overcommit

Reviewed by:	brooks, imp (previous version)
Discussed with:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D36540
---
 contrib/jemalloc/src/pages.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c
index 13de27a0087d..3600443e2cb5 100644
--- a/contrib/jemalloc/src/pages.c
+++ b/contrib/jemalloc/src/pages.c
@@ -12,6 +12,7 @@
 #include <sys/sysctl.h>
 #ifdef __FreeBSD__
 #include <vm/vm_param.h>
+#include <vm/vm.h>
 #endif
 #endif
 
@@ -455,7 +456,10 @@ os_overcommits_sysctl(void) {
 	}
 #endif
 
-	return ((vm_overcommit & 0x3) == 0);
+#ifdef SWAP_RESERVE_FORCE_ON
+	return ((vm_overcommit & (SWAP_RESERVE_FORCE_ON |
+	    SWAP_RESERVE_RLIMIT_ON)) == 0);
+#endif
 }
 #endif