From nobody Fri Jun 17 19:41:23 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 168DB85DB45; Fri, 17 Jun 2022 19:41:26 +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 4LPqD45SjQz3jGD; Fri, 17 Jun 2022 19:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494885; 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=e5qRGldQvGPrCYphNZemfgPPEQ3UnJ02K2wgJyd8494=; b=YjH20XdVWUP8Io9Bt4tOjoFnNpURhUheqZrlE3ciypOeT1KzBxEu4ZFzsV5BtBBxZJrsdm XiBp6/CQp8UbZK9wXbnPiR7DpYyWhK6FZSzq7l7d3hBj//WAryfabwUm467GPelaWx8xs8 Cw3eUPTppdHnrZxOvjkRnluN+WDDZC57AR+4hSYYdYaMLo9FRE5/M1b+2Qrhrqke1Goc8M 01Cxvm7BvP1BqH6DzRPvZHKuIo/HabIsg6KifPEI9y3nAQmO3dMDz9DOJYJp22C5hQyEwR Zq97ScX0H7KZpFswHtNPw+BZAQ8rhnU71Yuki4/jF6stgbVd4ExmUaOd6ULIlw== 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 C626F25E80; Fri, 17 Jun 2022 19:41:23 +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 25HJfN7u030413; Fri, 17 Jun 2022 19:41:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfNMj030412; Fri, 17 Jun 2022 19:41:23 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:23 GMT Message-Id: <202206171941.25HJfNMj030412@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: 601c19df364e - stable/13 - linux(4): Reduce duplication between MD parts of the Linuxulator 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 601c19df364ee064cb6011c178e3c6bb58ba9a34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494885; 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=e5qRGldQvGPrCYphNZemfgPPEQ3UnJ02K2wgJyd8494=; b=NLIg4M6oo7LWgWN73iY62aXN91Y+d0/0ztqFjyjQBDEbVWofHOyyRueSGHLB9UNdVNNOp9 XBgCi7rhkz34Dxw/zqRRIIGeZuI4rNyQbAosHwNhNpa6glbkjSiQxeZpGVql7Oqr+wMnH8 G0+kV3dA40QJLgrFSCnplpbZnkrH4u/xv94RQx7AjwrFPLN2PZgFzr9DvjaI20CUyFwI/o IuExxyfe73lNuJrJT5CiLJhhSXSqAvf4FVA6y14D90cO2h582PC7K1yS0J7cO3FiUVTLr5 z1MwK0lM2+GJY6jCONfAnrEWkMQkqZAoE13RemmYi63S4bOt1s1/AQpRbQZ54A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494885; a=rsa-sha256; cv=none; b=NL1O+DqmY8qpdhlGvKTr21gjLMBe/+epSkfkbrNt387mEMelPuDj9dJIXOPRyY9SM9mX72 lvmygFZF4JZamh8kw5v+gu9mT/KBhkxX6drEr9AkrebImUqKZ1PQsVLmHuWuJHxCfLa2zu hgaTRrc8A5d6b2hlV8fV/C+nOXlVsgGuqGD/UcJCpqr02UIHjf6aodHqZ1+SybsqI5GIZP 6kx7Q4DhCkr2JsQEwMlNMnVlNpbv52CWC3YbMRkHmvTYa/C5/t/9OKfO339RSwJY8NgT+G JcuWRJLND0z278quHcYTry0BuQfqmvxQYclqHWL/zYj5kdxslKdfjU8bHHZVBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=601c19df364ee064cb6011c178e3c6bb58ba9a34 commit 601c19df364ee064cb6011c178e3c6bb58ba9a34 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:47:26 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:37 +0000 linux(4): Reduce duplication between MD parts of the Linuxulator Move sigprocmask actions defines under compat/linux, they are identical across all Linux architectures. MFC after: 2 weeks (cherry picked from commit 2ca34847e7288fba6b2a15e64648238bc12e4960) --- sys/amd64/linux/linux.h | 5 ----- sys/amd64/linux32/linux.h | 5 ----- sys/arm64/linux/linux.h | 5 ----- sys/compat/linux/linux.h | 5 +++++ sys/i386/linux/linux.h | 5 ----- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 02aede96ce23..6f91e86255e2 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -161,11 +161,6 @@ struct l_newstat { #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - /* sigaltstack */ #define LINUX_MINSIGSTKSZ 2048 diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 6ba3d3214a09..f8b72e060de4 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -263,11 +263,6 @@ struct l_statfs64 { #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - /* sigaltstack */ #define LINUX_MINSIGSTKSZ 2048 diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index bf6e092f3bf8..9b78ac59f9dc 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -158,11 +158,6 @@ struct l_newstat { #define LINUX_SA_NOMASK 0x40000000 /* SA_NODEFER */ #define LINUX_SA_ONESHOT 0x80000000 /* SA_RESETHAND */ -/* sigprocmask actions */ -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - typedef void (*l_handler_t)(l_int); typedef struct { diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index f73a0484cf55..0309c4dbaaa8 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -167,6 +167,11 @@ void bsd_to_linux_sigset(sigset_t *, l_sigset_t *); int linux_to_bsd_signal(int sig); int bsd_to_linux_signal(int sig); +/* sigprocmask actions */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 + void linux_dev_shm_create(void); void linux_dev_shm_destroy(void); diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 75d2017fb61f..86fca2976f83 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -236,11 +236,6 @@ struct l_statfs64 { #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - /* sigaltstack */ #define LINUX_MINSIGSTKSZ 2048