From nobody Wed Oct 04 18:21:34 2023 X-Original-To: dev-commits-src-main@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 4S131C0htYz4vm3j; Wed, 4 Oct 2023 18:21:35 +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 4S131C0GdRz3VQN; Wed, 4 Oct 2023 18:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696443695; 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=CnBcRlL6RYeb3Z9TYp383a/LE4aQuhKpABbuezGWSu0=; b=VcizELk2dPjoPYBKdKbirMPvnM41LjDsxWi8BMZ5mu+hkaflDkoABkltJN1655ANlql5MJ INgPfkUrfBB39YJBfSWrCR81pAyHiGTxNx2Ly/choMBtvV6u8gOtWMWRLnuT8GsEnVAElq 3GHqfyCaCWdmvNoTCJjBXBLxgXXCVGZM0fVTggq8FqGcG705At4aizekfgziAuiF61iM17 Nr5e5PFzd4zzCtSRSbhKaqRJJMS7s31p4ob2+gmpTGCoILFwpk8lnEm2TZqqdtWP3KDd3R AIcAUu8jJAMttlqbh6SEq2/JWqy9QWuTRyD7uyr7hDgjxLIP3ENyBT1bk1zB2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696443695; a=rsa-sha256; cv=none; b=lra1GpeBLyIbZ/7U09TqRePP+cRBq+0rfy+sVkl9KfPIhxY8m3ox3Ple4sDSRS8TEuHpzV L2si1MU/kJ1d4u21kPRoSccG06CNuZarj9B7k8zcueMCCae7r6PgVMWJde4qHRZ9jg58IJ IloLc2emDwXyuG7+/JYdZmmwvZhNkbQqjBbrV6Qoh3nYCYlvdE65w58Jp5TF2uZfUWgN6z nyfMTSHINPDDk3eGcfPWcWkgIg3zP4K4GaYVibgUAw4LubXCphiANSnLa/trP1B4YDgkO9 6E0ORot1T/0Vwdj8jvzFTTTPdQpTc/hU/mUZ4qG22pim6+OXkNpfa/i2d3RsqQ== 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=1696443695; 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=CnBcRlL6RYeb3Z9TYp383a/LE4aQuhKpABbuezGWSu0=; b=KLBk6w/uECEMIs4rRX0ERCZsDWCxOhFIQG6Jpeoa5U0TdGt5CLPK4nlOidIZXpEJCpTfX8 hTBHBnYv7dFGJnGLOdX6egj1xGgSIXNk7BmXzj49ycylHI7ORs7w8fVbMDpKh4mw5i+Dq1 cyT/L2dQGFUmEVVT7543pzDOrddGDDNfj7G54KrFBLyF2jZSSmA4lVZn9PEm4maXI9xNPa N7+AA+7zHZNoBbzzy9EEgU2sdY9lR/nJ1fi1oc4NTAEKSHBYQVeKo7hAKkEudGlY5aSBFu DmSSJ7+t3jJq/wQUjRzzAhB4+Z8YoQbuoKI5H1AX0sBZXBjUxrhsp5Pba6JD2A== 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 4S131B6SK0znc9; Wed, 4 Oct 2023 18:21:34 +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 394ILYhQ085834; Wed, 4 Oct 2023 18:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394ILYSK085831; Wed, 4 Oct 2023 18:21:34 GMT (envelope-from git) Date: Wed, 4 Oct 2023 18:21:34 GMT Message-Id: <202310041821.394ILYSK085831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 4fe779900b5d - main - linux(4): Deduplicate SystemV IPC defines from amd64/linux List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4fe779900b5d9359969426d44679d28d3178604e Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4fe779900b5d9359969426d44679d28d3178604e commit 4fe779900b5d9359969426d44679d28d3178604e Author: Dmitry Chagin AuthorDate: 2023-10-04 18:18:45 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-04 18:18:45 +0000 linux(4): Deduplicate SystemV IPC defines from amd64/linux MFC after: 1 week --- 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;