diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-12 17:46:02 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-12 16:42:13 +0100 |
commit | ffb6c5c902c367d5eb82b84848333404649e4af6 (patch) | |
tree | 21f4f50189d50f98fce77321ea709bc0edb9d951 /meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch | |
parent | c24a700b1a4272255847b3fc1116ce624aca4a7b (diff) | |
download | poky-ffb6c5c902c367d5eb82b84848333404649e4af6.tar.gz |
lttng-modules: support kernel 5.18+
Backporting changes from lttng master to support building against
the 5.18+ kernel. No changes required to the patches. Once a new
-stable 2.13.x is released, we can drop these patches. To enable
newer kernel development against the LTS, it is worth pulling these
in while we wait for an upstream release.
(From OE-Core rev: 99c3034acf03a3099d78523c33501e58703a13b7)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8a7237a47488442513741930ea55d69dd6bd7be4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch new file mode 100644 index 0000000000..13c504b859 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 4 Apr 2022 15:08:48 -0400 | ||
4 | Subject: [PATCH 08/10] fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 26440303310591e29121964ede0048583cb3126d | ||
9 | Author: Christoph Hellwig <hch@lst.de> | ||
10 | Date: Thu Feb 24 18:55:52 2022 +0100 | ||
11 | |||
12 | scsi: core: Remove <scsi/scsi_request.h> | ||
13 | |||
14 | This header is empty now except for an include of <linux/blk-mq.h>, so | ||
15 | remove it. | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa | ||
20 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
21 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
22 | --- | ||
23 | include/instrumentation/events/block.h | 4 ++-- | ||
24 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h | ||
27 | index 050a59a2..882e6e08 100644 | ||
28 | --- a/include/instrumentation/events/block.h | ||
29 | +++ b/include/instrumentation/events/block.h | ||
30 | @@ -11,9 +11,9 @@ | ||
31 | #include <linux/trace_seq.h> | ||
32 | #include <lttng/kernel-version.h> | ||
33 | |||
34 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) | ||
35 | +#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) | ||
36 | #include <scsi/scsi_request.h> | ||
37 | -#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ | ||
38 | +#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */ | ||
39 | |||
40 | #ifndef _TRACE_BLOCK_DEF_ | ||
41 | #define _TRACE_BLOCK_DEF_ | ||
42 | -- | ||
43 | 2.19.1 | ||
44 | |||