From nobody Mon May 30 17:04:17 2022 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 D20D21B6090C; Mon, 30 May 2022 17:04:17 +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 4LBhb55Sdlz4kTT; Mon, 30 May 2022 17:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930257; 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=FZ0mcNyDjE+QczUQpJvBzNXPzh9ZNj8oMUVtcXnJzhM=; b=Mdqyihy8mstlBlL+Sdwf1Ud5VMEl8D6GRBXv/xcKU0vO0lD015tLff3TwJvhvOKhJ24T0S 9uv1KO1b4qFv+xL58gjmaZs77r7EmkI+8SuUuaoGA5tR8lQAgzDmZnLeoLoeNHMPcyo2H5 gh522XmEl4v5Oc7ityUt4/54FDAMptfbw2XL5n9buWwhUDFL85QRCqCs2f7DInHL3SktNh HVWlWJgNXyz0OeHl/+0Ifz1lgJ/5po8ufISF/XmF8Ts1O+r6gSvo6996KdhfRHnoUmDAS8 smI7tLEtgiMJRH+jNmZItI0YPlVMuQAxOawX+Odd6hs7a3f0vENAmWWJEQGtJw== 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 922FE1B490; Mon, 30 May 2022 17:04:17 +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 24UH4Hox067773; Mon, 30 May 2022 17:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UH4H1a067772; Mon, 30 May 2022 17:04:17 GMT (envelope-from git) Date: Mon, 30 May 2022 17:04:17 GMT Message-Id: <202205301704.24UH4H1a067772@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: 2ca34847e728 - main - linux(4): Reduce duplication between MD parts of the Linuxulator 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: 2ca34847e7288fba6b2a15e64648238bc12e4960 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930257; 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=FZ0mcNyDjE+QczUQpJvBzNXPzh9ZNj8oMUVtcXnJzhM=; b=K0mpQaAQ0AvgsGKh5RuB8LG+WU9uBAAaRfIf55UkmKUOsZBKD25m1gmtG2olWPpJkcCcSI ApITiAWSnD82zM8q9ke3mV5m/GhczJr1+4RWMln77tzHlY7HOMuGv8Zf3pnzq2lu86ta5h dfVPLWEYLlDWfQHrFT+t9xt6o2L8wQ8GVbAi67Y3wUeh8qudFAeA9KicuVTjjMzqxmRBm5 lP6Rg4bwJPp2Qk47jRO715bajHtJpilM2vX8QCT5PsM9bNw9zg/tncKAEutqfBRy73dnSh W5j5+FH3+Hz2nyyKaoEMfi++TMpZqemlOBAfWdhuh01ASSC2qcgzb3eWTxi9+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653930257; a=rsa-sha256; cv=none; b=k37kN8F8T3zX0Pi4e/kAN+UBhHkF8NAbp6yIUO2up1khWgth9wAntoe4IdrqqwUFR3uJ6C l3w1hWJ+VQpwOK4uC7GVZUeq8T2J0qjU5+F+4xb3Y3ylI3WRWebGFrOf6Jd6p1uflFHrdL pXpJBbDN45S/M2+1zSnRHHtpv7IA1BmaqF1PKliUspZER10V6gSnqIlg8H0cDEKIYl/fnE 76RJ0a0atQoc1M2kGtFyWP9Hl7eBl/zr9L2QLAZ00ls9iletjTLMFRKR4PJFfILWRznARW vxwUcD23TMeHXgxlEjX4z5BjIGQxp00S2MvrHo4rrrUp0AEt0s63a4lVrC/xCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2ca34847e7288fba6b2a15e64648238bc12e4960 commit 2ca34847e7288fba6b2a15e64648238bc12e4960 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:47:26 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-30 16:47:26 +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 --- 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