Date: Mon, 30 May 2022 17:04:17 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2ca34847e728 - main - linux(4): Reduce duplication between MD parts of the Linuxulator Message-ID: <202205301704.24UH4H1a067772@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2ca34847e7288fba6b2a15e64648238bc12e4960 commit 2ca34847e7288fba6b2a15e64648238bc12e4960 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-05-30 16:47:26 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205301704.24UH4H1a067772>