From nobody Thu May 19 16:57:18 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 663721ADFA40; Thu, 19 May 2022 16:57:18 +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 4L3wy61lwTz3K0x; Thu, 19 May 2022 16:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652979438; 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=XvBoSw2NNPKd1+iHNINhWTgMNmQzkavXUCfOL2cpBTs=; b=qLf2y4pz9dt5dtexzfSJLLK9G90jyup2RRWliclP1OZ6WnjTwJ21AV63ovgyZxVcQVAaq1 hF07MJucivqiunIwaCbOB/hwwbvlRJHJwjAsQClJkkkqwAGa8dD63uYXMLnSYbgATjMeEY mmOf96dBwylXbD07wdIIb48HfUTwhJ0/dZZwJCHShd2/DEuNzuw5jzSkEL597Q6s86pHNg BBxEWSqbI3/kCYWYoKL0IOObK4Tv7RLJgcKV77GLkxMB8wy6FBDoPaeSsZRFXFuFTbElk6 SYmHrVed49o3m9mJ8Qq/OWoHGe9Z5BwIzIcmRM9n0/vIzdibYS/Qme6JR/nh5w== 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 1CB2E215F4; Thu, 19 May 2022 16:57:18 +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 24JGvIIC060725; Thu, 19 May 2022 16:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JGvIvK060724; Thu, 19 May 2022 16:57:18 GMT (envelope-from git) Date: Thu, 19 May 2022 16:57:18 GMT Message-Id: <202205191657.24JGvIvK060724@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: 9386e18b395d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9386e18b395dd62f6d0cccad67af51e3ad1d2429 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652979438; 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=XvBoSw2NNPKd1+iHNINhWTgMNmQzkavXUCfOL2cpBTs=; b=SUUTYI+8xxsYFT2ogG8oIonbdyUiRAG/K/Mts3+1ZeBWpIuUwXOYdCLG5sD1fWkvaSg+e9 r1FL5M58fwgK0C8tcDWPj5PeRTkYh3YxrouUY+29JLyLpCtXaz1M/M1OqHTByEMLBreh1M CIWhCso8UY0rsfipzBRp9znL0HGEYWSWgxoCfIoisUQRU4Bn/dET3Hv4tgg6UAcI4ywSlg icF7ZSBhXLbfjRofwz65OErvOaAtbwBAGh6Oq2KqAg/eSqJNcvgBBWXxBsRj6UI8/NjC28 pju3/XTcVZ7bL4i/BAYog500tvJBoGzxQgr7nEVwh7bjTAd/vtU3ROeMhuKSzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652979438; a=rsa-sha256; cv=none; b=qZyHRFzoYScu5O0NKQd/oSO6OpNoktiUxG8Lep1qA49Q/a2hIIHNL5l6pchrM2aT1Du8I0 czrhv3cxAQs3QGf5QrNjgsqP6q+cCT0Lmxtncorn5U9La39I+InHFd11kcX+OIEHYaS2ok PYTLWfNkcf924fpjCF9lsOl457yRnLdKpKZLzxlgVkm+keLDg6CRtV9Np5GUKk2WHmqo0f 7BMTxgh4Jji5D4BCS/lW3aUUuvZTVm9ELkRr9miFidMuIz8SeOL3PCSFuA9hr0gc8jiGAQ PE1WG6+dFKOBoTT94cSs9MIpm4NnTP6GjyDqSKdvHPc8orYHejYRsjkLEoBpOw== 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=9386e18b395dd62f6d0cccad67af51e3ad1d2429 commit 9386e18b395dd62f6d0cccad67af51e3ad1d2429 Author: Dmitry Chagin AuthorDate: 2022-05-19 16:55:20 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-19 16:55:20 +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 --- 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,