diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-12 17:46:02 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-14 16:46:35 +0100 |
commit | b3ea0a07d46ebff0ae3fb02c7521ab971b3410db (patch) | |
tree | 756da88ee734e6ce3a1793aced818998f0fab0c0 /meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch | |
parent | 09fdbbcd193fdbb87af6dad57541e389a0a3a59f (diff) | |
download | poky-b3ea0a07d46ebff0ae3fb02c7521ab971b3410db.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: 8a7237a47488442513741930ea55d69dd6bd7be4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch new file mode 100644 index 0000000000..9248ffe4ff --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 4 Apr 2022 13:54:59 -0400 | ||
4 | Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 322cbb50de711814c42fb088f6d31901502c711a | ||
9 | Author: Christoph Hellwig <hch@lst.de> | ||
10 | Date: Mon Jan 24 10:39:13 2022 +0100 | ||
11 | |||
12 | block: remove genhd.h | ||
13 | |||
14 | There is no good reason to keep genhd.h separate from the main blkdev.h | ||
15 | header that includes it. So fold the contents of genhd.h into blkdev.h | ||
16 | and remove genhd.h entirely. | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd | ||
21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
23 | --- | ||
24 | include/wrapper/genhd.h | 4 ++++ | ||
25 | 1 file changed, 4 insertions(+) | ||
26 | |||
27 | diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h | ||
28 | index 3c6dbcbe..4a59b68e 100644 | ||
29 | --- a/include/wrapper/genhd.h | ||
30 | +++ b/include/wrapper/genhd.h | ||
31 | @@ -12,7 +12,11 @@ | ||
32 | #ifndef _LTTNG_WRAPPER_GENHD_H | ||
33 | #define _LTTNG_WRAPPER_GENHD_H | ||
34 | |||
35 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) | ||
36 | +#include <linux/blkdev.h> | ||
37 | +#else | ||
38 | #include <linux/genhd.h> | ||
39 | +#endif | ||
40 | |||
41 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) | ||
42 | #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN | ||
43 | -- | ||
44 | 2.19.1 | ||
45 | |||