The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9386e18b395dd62f6d0cccad67af51e3ad1d2429
commit 9386e18b395dd62f6d0cccad67af51e3ad1d2429 Author: Dmitry Chagin <[email protected]> AuthorDate: 2022-05-19 16:55:20 +0000 Commit: Dmitry Chagin <[email protected]> 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,
