git: 0e2af3b59a15 - main - jemalloc: Define SWAP_RESERVE_* if not provided by the system headers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 Sep 2022 22:36:04 UTC
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c
commit 0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-09-16 21:08:03 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-09-16 22:35:35 +0000
jemalloc: Define SWAP_RESERVE_* if not provided by the system headers
instead ifdef-ing out the return statement.
Reported by: Mark Millard <marklmi@yahoo.com>
Fixes: 87384c51e047
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
---
contrib/jemalloc/src/pages.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c
index 6b00eb0cb919..6405bb528984 100644
--- a/contrib/jemalloc/src/pages.c
+++ b/contrib/jemalloc/src/pages.c
@@ -464,10 +464,12 @@ os_overcommits_sysctl(void) {
}
#endif
-#ifdef SWAP_RESERVE_FORCE_ON
+#ifndef SWAP_RESERVE_FORCE_ON
+#define SWAP_RESERVE_FORCE_ON (1 << 0)
+#define SWAP_RESERVE_RLIMIT_ON (1 << 1)
+#endif
return ((vm_overcommit & (SWAP_RESERVE_FORCE_ON |
SWAP_RESERVE_RLIMIT_ON)) == 0);
-#endif
}
#endif