From nobody Thu May 23 00:27:10 2024 X-Original-To: dev-commits-src-branches@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 4Vl8BQ6x1Tz5LLSD; Thu, 23 May 2024 00:27:10 +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 4Vl8BQ6PlHz4g5L; Thu, 23 May 2024 00:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716424030; 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=bAuUlS9a/YjjBgknCIN8gpwhUaDVbe6cURsiMjQDEN8=; b=yHdePxjf7kbN/yEDZEqBWBQBt6lliSEavyWjUCTcKlf4l74GVJy0ZJU7ZBvjhmVwluKmlc OqhCrx24Gmk59EcF1lM00056fDGzG+IE6doGqL5LzJCyNRyauesjlCZv2B+KtKdmy+1lmu 8TOlZVoCKkVpmaAqwvCjJj0GhDtohd5UF9lLeHGJPA06Gl0iLwb464PMYqMRLJej1lnHxU BTm8+E/jb5Ty/HgQ4qa0AaKYb7Ul3elhD+OFJ5JisMyMOL1J5ZN3s3DdyPFADf8LHSB9c8 jov2ugyUAW9zZ73sC1GEGkaNKNIdHHnNV3UTT+07lhGorm4fiCppRA9YERWJug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716424030; a=rsa-sha256; cv=none; b=QAxSe3DdpCZTMATfmH0gVA7gs9RVqUGYEkHCQgRPnkEUMShlFhjRCf2ntpQph43it8rN/D 4dxxf8yccdXEt0yt+UxJ3YrwqzCWLtMC1fTJyjWOToJoe+teya4mKzZDU7Zxxj9gVZ8ZNF qNwuVvkb42g5WdVpO7lCyEGGrgpmg77z0YEX5cdRheECMmu2WtqAkymNMmUSwWLESGBKFq mJtU9clGOhtzqPsnJrjCUToi6u8H5s0sLEBQDkFYmkDPrccCcuikiGQh96i6idkKfkTu93 sx1XeePfZYY5q461ktRv8bMfOlHDwzmxmTjfcful3xbs5lOQghIE3alhfkYYnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716424030; 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=bAuUlS9a/YjjBgknCIN8gpwhUaDVbe6cURsiMjQDEN8=; b=cLzMX5nz9Fk9SYLA5SveEOJ/cEdduh/J1kOqbm707acEYcL8BT+Gr0yMJY1WgslEglPaVt GYDH0uSzqYTbSNFEuXA+caCgPjWedqo3Tr2C6Q6Yk6Ji+m2CUxzaICPyGW8+GD4P8YQ9GH JRQHgEARBxfGAFzjj+9RGjcNOlheAzd6+TaM42yHviSzn6MronMkBKUhG5Ig7gWRLvHbXf hV2RQl58LcMwA6z2/Xppp/CkrEadAk7qvFhUEKZYsKv0dge09y4+fhoE9ZHBOw/Nc9l+sX 07+hzOOGYCimDorXWN8BuJtfVJxNZEm8F2D39g6ctut5QbGb/+c7wQpw8Tk47g== 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 4Vl8BQ608kzRhT; Thu, 23 May 2024 00:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44N0RA4v020647; Thu, 23 May 2024 00:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N0RAZr020644; Thu, 23 May 2024 00:27:10 GMT (envelope-from git) Date: Thu, 23 May 2024 00:27:10 GMT Message-Id: <202405230027.44N0RAZr020644@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: afb68a177420 - stable/14 - SysV SHM: move SHMSEG constants to sys/shm.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: afb68a1774206059cf31cbae8269c9453669febd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afb68a1774206059cf31cbae8269c9453669febd commit afb68a1774206059cf31cbae8269c9453669febd Author: Konstantin Belousov AuthorDate: 2024-05-16 15:24:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-23 00:26:44 +0000 SysV SHM: move SHMSEG constants to sys/shm.h (cherry picked from commit 53725168e1b631be0e60f888ba5e63e140b57766) --- sys/kern/sysv_shm.c | 4 ---- sys/sys/shm.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 2529a9eeb1a7..8f67cb63f33c 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -109,10 +109,6 @@ FEATURE(sysv_shm, "System V shared memory segments support"); static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); -#define SHMSEG_FREE 0x0200 -#define SHMSEG_REMOVED 0x0400 -#define SHMSEG_ALLOCATED 0x0800 - static int shm_last_free, shm_nused, shmalloced; vm_size_t shm_committed; static struct shmid_kernel *shmsegs; diff --git a/sys/sys/shm.h b/sys/sys/shm.h index 0b5cba0120e5..9c6dad5d43cc 100644 --- a/sys/sys/shm.h +++ b/sys/sys/shm.h @@ -152,6 +152,10 @@ struct vmspace; extern struct shminfo shminfo; +#define SHMSEG_FREE 0x0200 +#define SHMSEG_REMOVED 0x0400 +#define SHMSEG_ALLOCATED 0x0800 + void shmexit(struct vmspace *); void shmfork(struct proc *, struct proc *);