From nobody Fri Jun 17 19:40:49 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 62FC985D498; Fri, 17 Jun 2022 19:40:51 +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 4LPqCQ2q9Jz3htZ; Fri, 17 Jun 2022 19:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494851; 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=0bnegAAXia5kVswD4VHbk4jUUX/fqndWtVO346s+2Yg=; b=f9ADkl32KqKpC+9RuxD0y3tefppqujqtF/6vM/MokqSbeoUUbXA/kECCkHX/cqVC3PfMcI /HX5T/lleTXLNXwUzJ38vfCUSBHYGz/ovCjytLE2GiPUkpO/hKLuhjr53luXEXJl2sHqaM AsQPR/0i3WI6IZK/QOA1APnGHXrBwEb23TUQmqnt8NMxduHkWu+XpQJxhA2g9HrQGSFlIH bimqIgd0uXHImuvZZ8aJ4Bc5Dnnr1ID471aT4rT9oBVZhoyycaOG5xHuz4x7nN4SAguguS gXywFzlYB7aln0wa7PxjiNn4JlySMNIefAdngS0wUp3P1aS9SobghzZ0kbaa1w== 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 7D008257F0; Fri, 17 Jun 2022 19:40:49 +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 25HJen5V026319; Fri, 17 Jun 2022 19:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJenxW026318; Fri, 17 Jun 2022 19:40:49 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:49 GMT Message-Id: <202206171940.25HJenxW026318@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: ecb5287bae3f - stable/13 - linux(4): Move signal codes definitions to the appropriate header 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: ecb5287bae3fe3438bf5c32496718eef37097f0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494851; 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=0bnegAAXia5kVswD4VHbk4jUUX/fqndWtVO346s+2Yg=; b=yFaHQPOfhkHxqhnMxf/+M+8H5b68FiG9Kdu1JRIsskerwRi9lfOqfO1Bp06eHROk1gnOxv AdgxypYQvAu3P65ip5gVsNByRUeTowKVeHtwXbpFPprlcCwgODyq/s/6PXJq0U+aId9lz+ 3l9LcATB4LOfmbT+K79Y5cI69eZtMCifXwj+pYRKPnSCUY/taHYVjlpuJtDs8EPvc+59Mi 1ENtzdjApQytbr51RxHkjIa70ZteReEkd2aBp40gxVG48CNUmKDBzvDtG4v1UskjS+fjxI 2d5+yCjxE8z3EkqQmsU1wNfXSg8pJG0P1XhNdtj8d6QeRfTpiVxAjoIms5r2Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494851; a=rsa-sha256; cv=none; b=DJj3Pa7f9IvrvKAAX5auYMIJCRmzPIV/g1CrGwg2WoEH75/eed9uczRhO9CwfppxpiTQc0 qpPF7Zd0NebltNBhwinGSDpcddkQUXaPX3V2oXI/9oKbo8yI3naJBMdAPeiqyPb5rngaEj kkYPRfYm6SJYDIUuspEdPOxvYwc7MTRiqGHgt+3riIUkBG1g9Soygpm5IyYpC+qEbBbWt4 seGMcTBwQSoLcgWuH9sZ1Q8wulPds6+TTKTB6dlNWPidWOkSP7F+8V0LXxo/7wd5rg1ZyX GzlgGzCtHvZ5nP2U0l0DonH0jY6YTiQBnIZ2rouuwfsZYMtiDpXTmpoyYExBIA== 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=ecb5287bae3fe3438bf5c32496718eef37097f0f commit ecb5287bae3fe3438bf5c32496718eef37097f0f Author: Dmitry Chagin AuthorDate: 2022-05-19 16:55:20 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:26 +0000 linux(4): Move signal codes definitions to the appropriate header In the Linux the struct siginfo related bits are placed into the siginfo.h header. MFC after: 2 weeks (cherry picked from commit 9386e18b395dd62f6d0cccad67af51e3ad1d2429) --- sys/compat/linux/linux_siginfo.h | 12 ++++++++++++ sys/compat/linux/linux_signal.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_siginfo.h b/sys/compat/linux/linux_siginfo.h index cb5c3e76482c..eb9120a0208a 100644 --- a/sys/compat/linux/linux_siginfo.h +++ b/sys/compat/linux/linux_siginfo.h @@ -36,6 +36,18 @@ #ifndef _LINUX_SIGINFO_H_ #define _LINUX_SIGINFO_H_ +/* + * si_code values + */ +#define LINUX_SI_USER 0 /* sent by kill, sigsend, raise */ +#define LINUX_SI_KERNEL 0x80 /* sent by the kernel from somewhere */ +#define LINUX_SI_QUEUE -1 /* sent by sigqueue */ +#define LINUX_SI_TIMER -2 /* sent by timer expiration */ +#define LINUX_SI_MESGQ -3 /* sent by real time mesq state change */ +#define LINUX_SI_ASYNCIO -4 /* sent by AIO completion */ +#define LINUX_SI_SIGIO -5 /* sent by queued SIGIO */ +#define LINUX_SI_TKILL -6 /* sent by tkill system call */ + typedef union l_sigval { l_int sival_int; l_uintptr_t sival_ptr; diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h index 8d6022fc3cc7..75fe0b24e592 100644 --- a/sys/compat/linux/linux_signal.h +++ b/sys/compat/linux/linux_signal.h @@ -31,18 +31,6 @@ #ifndef _LINUX_SIGNAL_H_ #define _LINUX_SIGNAL_H_ -/* - * si_code values - */ -#define LINUX_SI_USER 0 /* sent by kill, sigsend, raise */ -#define LINUX_SI_KERNEL 0x80 /* sent by the kernel from somewhere */ -#define LINUX_SI_QUEUE -1 /* sent by sigqueue */ -#define LINUX_SI_TIMER -2 /* sent by timer expiration */ -#define LINUX_SI_MESGQ -3 /* sent by real time mesq state change */ -#define LINUX_SI_ASYNCIO -4 /* sent by AIO completion */ -#define LINUX_SI_SIGIO -5 /* sent by queued SIGIO */ -#define LINUX_SI_TKILL -6 /* sent by tkill system call */ - int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); void siginfo_to_lsiginfo(const siginfo_t *si, l_siginfo_t *lsi, l_int sig); int lsiginfo_to_siginfo(struct thread *td, const l_siginfo_t *lsi,