| From 26bc064a4d4c85e6000393aadb38659f99b59162 Mon Sep 17 00:00:00 2001 |
| From: Michael Jeanson <mjeanson@efficios.com> |
| Date: Mon, 5 Nov 2018 11:35:53 -0500 |
| Subject: [PATCH 2/9] Fix: signal: Remove SEND_SIG_FORCED (v4.20) |
| |
| See upstream commit : |
| |
| commit 4ff4c31a6e85f4c49fbeebeaa28018d002884b5a |
| Author: Eric W. Biederman <ebiederm@xmission.com> |
| Date: Mon Sep 3 10:39:04 2018 +0200 |
| |
| signal: Remove SEND_SIG_FORCED |
| |
| There are no more users of SEND_SIG_FORCED so it may be safely removed. |
| |
| Remove the definition of SEND_SIG_FORCED, it's use in is_si_special, |
| it's use in TP_STORE_SIGINFO, and it's use in __send_signal as without |
| any users the uses of SEND_SIG_FORCED are now unncessary. |
| |
| This makes the code simpler, easier to understand and use. Users of |
| signal sending functions now no longer need to ask themselves do I |
| need to use SEND_SIG_FORCED. |
| |
| Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| |
| Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/26bc064a4d4c85e6000393aadb38659f99b59162 |
| |
| Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| |
| --- |
| instrumentation/events/lttng-module/signal.h | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h |
| index 8783b52..ad8fe69 100644 |
| --- a/instrumentation/events/lttng-module/signal.h |
| +++ b/instrumentation/events/lttng-module/signal.h |
| @@ -12,6 +12,17 @@ |
| #include <linux/signal.h> |
| #include <linux/sched.h> |
| #undef LTTNG_FIELDS_SIGINFO |
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0)) |
| +#define LTTNG_FIELDS_SIGINFO(info) \ |
| + ctf_integer(int, errno, \ |
| + (info == SEND_SIG_NOINFO || info == SEND_SIG_PRIV) ? \ |
| + 0 : \ |
| + info->si_errno) \ |
| + ctf_integer(int, code, \ |
| + (info == SEND_SIG_NOINFO) ? \ |
| + SI_USER : \ |
| + ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) |
| +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ |
| #define LTTNG_FIELDS_SIGINFO(info) \ |
| ctf_integer(int, errno, \ |
| (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \ |
| @@ -21,6 +32,7 @@ |
| (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \ |
| SI_USER : \ |
| ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) |
| +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ |
| #endif /* _TRACE_SIGNAL_DEF */ |
| |
| /** |
| -- |
| 2.19.1 |
| |