From nobody Fri Sep 30 02:04:20 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mdtnw2jt9z4dfJb; Fri, 30 Sep 2022 02:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mdtnw28lHz3ftg; Fri, 30 Sep 2022 02:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2AfdWGMgIoqatxYpEVirojUu1gmszGbq7QygEiSQXo=; b=f8SiNPS4q5y/K0XDTGo1B8wXQgFOJxAXYqr3PlwzJui/2N8G/Hud+5wJEQITPGOZDkZyM/ bTDnt0/lMLPcCTz/OvtAMkZr+t2QJQi0J3xvkwLJJmb1/eXcLWx3D0qf93L5OdxtXyw5Sv 059QJIzrdNJ7JMxEUnkyqXfYNKf8DQncAG1zjRTYUwb/n0sZxpKRdz6PSlNcoXbVbrgn7T d4QQHCDYXUCRz8ixEYijni0czQYl4UAg5Itp8NjDEFoGBU2mVBuVn948lWI/flVN5hCOcK N0LWOYvMxP40g+bLNbxy3gLaRcufF65seLX8njBik+B+IbBA8oFGZOxy6dUxXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mdtnw18WCz11kr; Fri, 30 Sep 2022 02:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28U24KSW099345; Fri, 30 Sep 2022 02:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U24KCs099344; Fri, 30 Sep 2022 02:04:20 GMT (envelope-from git) Date: Fri, 30 Sep 2022 02:04:20 GMT Message-Id: <202209300204.28U24KCs099344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3a1bb7f8d989 - stable/13 - jemalloc: Define SWAP_RESERVE_* if not provided by the system headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3a1bb7f8d989cc5413147996d1935ac44790bbb3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2AfdWGMgIoqatxYpEVirojUu1gmszGbq7QygEiSQXo=; b=l3IS9VmSIdXT11Z7oOQdgdl1DNUEpYLjCMUKKjoM4aDgPbcOX9O9zdolG7z0n2uKhsHgeo vDgyDTGmQ00Ui+yAGVc+GDJvNF99A7eZ1uldOoRnE3q56vBw99f0PRasdLb71kKdKl0QhM 6Trwf6MwL0ybsi6fKYSH5B2vQ/o2fKJHAwXOm5uBjTlwZBpH8F8lLAFRMDrg016qFrIIsH xYo2ZywVVSG+MH16BlEDkyqFX+beKdGgIAyE0AFXrxiC2YFVmaW/3UV7PJ+8hazN8n4USE ubppu6LyEfyEYrXM8t8i3uaOdlQIcnyP77RAAMv0vR9TeSFVo5Idxes7U64pLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664503460; a=rsa-sha256; cv=none; b=u2ISoVkUjJ8zGFKZEUuHBGUUA/tCyX2uKE2nLi141SHBpZ3H9Z1FGry7wCScHLmKaIGU9V kwNJlteDRRUdyUQFh7eEXO0KAM00vs2M6hMxcAVSapxXYAWn48bjKMMVEg94c7Bf2JzXqA 7xY9+iBFVkR8FrFUsAgQzL/mNlnNuAhSrM3Mb1XYkANePq9Xbe/jRx/MZhNU6IVxA7r5SF EU72pJuwy4TQREisw+dd+8EWkJIHwAIbXiayRJshhdwXq2YIPcApHXuuDw4gClfmlRtkT9 dcJE88ES3M/hN3DY9wqJ+acgATAbo/CIzP5VFm7y3uoCpJ892eVvs2aeUP6JYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3a1bb7f8d989cc5413147996d1935ac44790bbb3 commit 3a1bb7f8d989cc5413147996d1935ac44790bbb3 Author: Konstantin Belousov AuthorDate: 2022-09-16 21:08:03 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-30 00:29:10 +0000 jemalloc: Define SWAP_RESERVE_* if not provided by the system headers (cherry picked from commit 0e2af3b59a1517521e9fb3aab61fa06e5ce25c2c) --- 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