From nobody Thu May 23 00:28:05 2024 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 4Vl8CT4NPqz5LL6F; Thu, 23 May 2024 00:28:05 +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 4Vl8CT1KBTz4hGh; Thu, 23 May 2024 00:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716424085; 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=Q7tJyXyg1msmZZAAw1Aiw6hkWAAnDpIbP78zNMZVKsw=; b=hXYM7+4QuVd3AfSLOZc4GbhS8H0FnuvZAngg9S49lcF9ln/w/BYJviMXNx5ppKyVxYkZXG ib7vOzeFeg2Cnq+tAzll39ZiiNtagGlvVVm5no6ZzOjnNUM7iPlE0PXzhUAJhmrGHzkB4z oeK9FBUOs6gPjPNfQTYytnakAakhf01ik6nGn2ROKXFhMRaHrXUpbODQ1ustiQssT1w0II RTZ3p/aN/wEd6NzrJzqEzoEQz4roD6JNSe33U9pDD1SznClmo+2TkfJ7P2GOwd5J4WYxmv XejAOToa/rojwtfNrWugqaS8lizbmOpDrVRX+e5JSm9uE5kLj+6uuJ0ZUunFxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716424085; a=rsa-sha256; cv=none; b=kofcFHv7RHrr7rZ42x5LGW1lyGJBI0IJcsvDG8gRZUlW9yDDmjHVnfW6b81X5QJS6wjDcd 9GQSkhEJcCLj51kaKg9LwVJdQClyWUN8hSDh6wnykqUKtG7gT3ORRVg9s/ZgvsX6Hj/w6Z t42lm+05QREPX2/c7TqlajKimXK1Ma6MgsZPGlm+UzNgTz/gA3Ta1d1JT4/P9Bro6wgbtf nCqamzzyZevWysr/eP4+bApv+iT2lXE601iY/T+ocZZToxymlkK7sQrYyYVWcbmS5Pgv7E bFVdJenwav7tmnBhzHjwG+BbTYowP45jN9XKRzpqvHHqAuch2yauwKPihCmSuA== 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=1716424085; 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=Q7tJyXyg1msmZZAAw1Aiw6hkWAAnDpIbP78zNMZVKsw=; b=d4Fy9D62mnm/QTKI6K+x0ot2A6VZ85w4znKClx5MhP3toooujIyTvm/M9mZLvHzNnugdYt CwvLTvl2c/2PH0wchZjyXeB4yy6B0QD8/YyuO0OhgPJnXwHL6ftcZL99vpJiUNsRFr74xz OfWuQpx4gfzSJav05ZWT1hUq0GD9DLo1PhwwAKB88MY0WwU3u6N9yJ2JQDQwwngA+RvSHQ b4C1hcWWV4PIvA8lnv6ndfMeTYu3e2UwsDc0uodX8JcAdJZzNEEmOuatQ0YIJzckqmNIY1 z4afhAbpkGBtg66uNRgOAw5wqGxiz7opVazxbEMCUYc0eKYuzVSt7wXnPvWerw== 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 4Vl8CT0tCTzQxb; Thu, 23 May 2024 00:28:05 +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 44N0S51f021131; Thu, 23 May 2024 00:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N0S5l3021128; Thu, 23 May 2024 00:28:05 GMT (envelope-from git) Date: Thu, 23 May 2024 00:28:05 GMT Message-Id: <202405230028.44N0S5l3021128@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: 454ebd0be5ee - stable/13 - SysV SHM: move SHMSEG constants to sys/shm.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 454ebd0be5ee35e804759c6fff0144f08f75f538 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=454ebd0be5ee35e804759c6fff0144f08f75f538 commit 454ebd0be5ee35e804759c6fff0144f08f75f538 Author: Konstantin Belousov AuthorDate: 2024-05-16 15:24:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-22 23:47:23 +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 91ee7c557136..1da95b86c9ba 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 *);