From nobody Tue Oct 10 09:06:43 2023 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 4S4VQD2Cp8z4wRKs; Tue, 10 Oct 2023 09:06:44 +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 4S4VQD1ZGKz3KLW; Tue, 10 Oct 2023 09:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696928804; 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=4YspMrAB9zVI55AcLXdHftv0yAlcfSUHMRk3zculJJw=; b=XXZtpL7lpZN+WR1Xbnxd/NNJFiUCfpre9v2R6rN8OGh3aTcQIgXptYFhZa+0qgNdoTcQQK XrecvJI+LooxT5J22pvBpgxZWsDpz/AwnIT6jCi530bhjiXPscPX0hOEaioBG8Cp0bS5BB uDBhaUzF5y0ZU4MOiUvv9n+BRbiqfVQtEcwnMqHwJHSqnwQTzKZriqEno4oOcRKvThGxsM 1uLM47L7ByIqDJ2cKvr56mHkfZyZ9/FESkW0Oyiy2IeZpBzl2MisbPRpfNSLg1Nmhace0m +bDAuEeXybkdgtfpdZAXShJIWucyHvhx9tel+S7lJaZ2SySEjYMHq2dlAy9Wqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696928804; a=rsa-sha256; cv=none; b=Ypjm8SJ+SrCAaR8vXc9MnC0Xfjg/rHm8mSC5tTydZUA0KGaJLYGwdJ3E1TI4qiGyedeny8 dHrP/xJA4FS36kpy4Xcmi/ezk//AqDU59TYf3M/dtBTG9Z2kReYXgbNVRG5/7tnMk6yx0s 4kMAoSHWQgvQjuhfgqKvvkIggjipPE+PvIpG6Td6dy0mYKP9obhSSOIH6F4pT43HosoSIU C8npEO86BGUJ/UEkCFPFuT7XDtQJ9JDFgnn/V43my6Mzm4BGH/+Tf/pkPXC+QrHMFAxYkL y7NYk2/1fklxIf1uxtPWZotwx1RqkdjdlUw6zFFQVaC6Vv8Xs8C+7M0IgGybiQ== 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=1696928804; 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=4YspMrAB9zVI55AcLXdHftv0yAlcfSUHMRk3zculJJw=; b=sa8ipLIj6/NYwMjHbgbcbRGzq4H3jjWA5nwwfRXXqm9FLeLYp8xKjW5ihM28evFqhDsozy vU46z6n0DCVfDXW6NsuzDfxhAr1JsFRFXGW64CdpwFuS8ZoW6fVozlEe+9DfqiMizCKOEU fYPik2j+VzHGuV64pdQTRNFfl8luNsYfTXSdJPT5d31wrIk5Qq8f1POVH0+pMzSszBjzmr rMJQFGmTtlrqHMTwuv7SinTTsvuLGRRNJkgTPYsLpyD386X/s7GUwNqxwwdT4IbQgxXnAd qxPB/0juuIKcchQAlilLy8cqP7Hu4jEciK1Ibcn2R2K7nd5J5SNzNRz7mqTR5w== 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 4S4VQD0WwLzXnK; Tue, 10 Oct 2023 09:06:44 +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 39A96hDn055054; Tue, 10 Oct 2023 09:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39A96hxI055051; Tue, 10 Oct 2023 09:06:43 GMT (envelope-from git) Date: Tue, 10 Oct 2023 09:06:43 GMT Message-Id: <202310100906.39A96hxI055051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 78d34c77f425 - stable/14 - linux(4): Deduplicate SystemV IPC defines from amd64/linux 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78d34c77f42525f9a4005a5e751ee1ead94d4763 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=78d34c77f42525f9a4005a5e751ee1ead94d4763 commit 78d34c77f42525f9a4005a5e751ee1ead94d4763 Author: Dmitry Chagin AuthorDate: 2023-10-04 18:18:45 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-10 09:06:28 +0000 linux(4): Deduplicate SystemV IPC defines from amd64/linux MFC after: 1 week (cherry picked from commit 4fe779900b5d9359969426d44679d28d3178604e) --- sys/amd64/linux/linux.h | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 4603835e15e6..918b9129f47b 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -188,34 +188,6 @@ typedef struct { #define LINUX_MS_NOEXEC 0x0008 #define LINUX_MS_REMOUNT 0x0020 -/* - * SystemV IPC defines - */ -#define LINUX_IPC_RMID 0 -#define LINUX_IPC_SET 1 -#define LINUX_IPC_STAT 2 -#define LINUX_IPC_INFO 3 - -#define LINUX_SHM_LOCK 11 -#define LINUX_SHM_UNLOCK 12 -#define LINUX_SHM_STAT 13 -#define LINUX_SHM_INFO 14 - -#define LINUX_SHM_RDONLY 0x1000 -#define LINUX_SHM_RND 0x2000 -#define LINUX_SHM_REMAP 0x4000 - -/* semctl commands */ -#define LINUX_GETPID 11 -#define LINUX_GETVAL 12 -#define LINUX_GETALL 13 -#define LINUX_GETNCNT 14 -#define LINUX_GETZCNT 15 -#define LINUX_SETVAL 16 -#define LINUX_SETALL 17 -#define LINUX_SEM_STAT 18 -#define LINUX_SEM_INFO 19 - union l_semun { l_int val; l_uintptr_t buf;