diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch new file mode 100644 index 0000000000..905b68165b --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 26bc064a4d4c85e6000393aadb38659f99b59162 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 5 Nov 2018 11:35:53 -0500 | ||
4 | Subject: [PATCH 2/9] Fix: signal: Remove SEND_SIG_FORCED (v4.20) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 4ff4c31a6e85f4c49fbeebeaa28018d002884b5a | ||
9 | Author: Eric W. Biederman <ebiederm@xmission.com> | ||
10 | Date: Mon Sep 3 10:39:04 2018 +0200 | ||
11 | |||
12 | signal: Remove SEND_SIG_FORCED | ||
13 | |||
14 | There are no more users of SEND_SIG_FORCED so it may be safely removed. | ||
15 | |||
16 | Remove the definition of SEND_SIG_FORCED, it's use in is_si_special, | ||
17 | it's use in TP_STORE_SIGINFO, and it's use in __send_signal as without | ||
18 | any users the uses of SEND_SIG_FORCED are now unncessary. | ||
19 | |||
20 | This makes the code simpler, easier to understand and use. Users of | ||
21 | signal sending functions now no longer need to ask themselves do I | ||
22 | need to use SEND_SIG_FORCED. | ||
23 | |||
24 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
25 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
26 | |||
27 | Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/26bc064a4d4c85e6000393aadb38659f99b59162 | ||
28 | |||
29 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
30 | |||
31 | --- | ||
32 | instrumentation/events/lttng-module/signal.h | 12 ++++++++++++ | ||
33 | 1 file changed, 12 insertions(+) | ||
34 | |||
35 | diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h | ||
36 | index 8783b52..ad8fe69 100644 | ||
37 | --- a/instrumentation/events/lttng-module/signal.h | ||
38 | +++ b/instrumentation/events/lttng-module/signal.h | ||
39 | @@ -12,6 +12,17 @@ | ||
40 | #include <linux/signal.h> | ||
41 | #include <linux/sched.h> | ||
42 | #undef LTTNG_FIELDS_SIGINFO | ||
43 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0)) | ||
44 | +#define LTTNG_FIELDS_SIGINFO(info) \ | ||
45 | + ctf_integer(int, errno, \ | ||
46 | + (info == SEND_SIG_NOINFO || info == SEND_SIG_PRIV) ? \ | ||
47 | + 0 : \ | ||
48 | + info->si_errno) \ | ||
49 | + ctf_integer(int, code, \ | ||
50 | + (info == SEND_SIG_NOINFO) ? \ | ||
51 | + SI_USER : \ | ||
52 | + ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) | ||
53 | +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ | ||
54 | #define LTTNG_FIELDS_SIGINFO(info) \ | ||
55 | ctf_integer(int, errno, \ | ||
56 | (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \ | ||
57 | @@ -21,6 +32,7 @@ | ||
58 | (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \ | ||
59 | SI_USER : \ | ||
60 | ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) | ||
61 | +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ | ||
62 | #endif /* _TRACE_SIGNAL_DEF */ | ||
63 | |||
64 | /** | ||
65 | -- | ||
66 | 2.19.1 | ||
67 | |||