The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=db589b5de60806aa5e775ed075cb76a09ccdb95f

commit db589b5de60806aa5e775ed075cb76a09ccdb95f
Author:     Warner Losh <i...@freebsd.org>
AuthorDate: 2024-12-13 22:47:47 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2024-12-13 23:04:40 +0000

    jemalloc: Retire ifdef for ELF_BSDF_VMNOOVERCOMMIT
    
    ELF_BSDF_VMNOOVERCOMMIT was introduced in time for stable/13 (but not
    stable/12), so is now in all supported branches. We're highly unlikely
    to merge future versions to stable/13 let alone anything earlier.
    
    Sponsored by:           Netflix
---
 contrib/jemalloc/src/pages.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c
index 6405bb528984..5df9ccdfe5df 100644
--- a/contrib/jemalloc/src/pages.c
+++ b/contrib/jemalloc/src/pages.c
@@ -441,13 +441,10 @@ static bool
 os_overcommits_sysctl(void) {
        int vm_overcommit;
        size_t sz;
-
-#ifdef ELF_BSDF_VMNOOVERCOMMIT
        int bsdflags;
 
        if (_elf_aux_info(AT_BSDFLAGS, &bsdflags, sizeof(bsdflags)) == 0)
                return ((bsdflags & ELF_BSDF_VMNOOVERCOMMIT) == 0);
-#endif
 
        sz = sizeof(vm_overcommit);
 #if defined(__FreeBSD__) && defined(VM_OVERCOMMIT)

Reply via email to