diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch b/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch new file mode 100644 index 0000000000..90fec9dc58 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | From 82fbf9d383ff9069808fb0f5f75c660098dbae52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Tue, 5 Apr 2022 14:57:41 -0400 | ||
4 | Subject: [PATCH 09/10] Rename genhd wrapper to blkdev | ||
5 | |||
6 | The genhd.h header was folded into blkdev.h in v5.18, rename our wrapper | ||
7 | to follow upstream. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 | ||
12 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
13 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
14 | --- | ||
15 | include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- | ||
16 | src/lttng-statedump-impl.c | 2 +- | ||
17 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
18 | rename include/wrapper/{genhd.h => blkdev.h} (93%) | ||
19 | |||
20 | diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h | ||
21 | similarity index 93% | ||
22 | rename from include/wrapper/genhd.h | ||
23 | rename to include/wrapper/blkdev.h | ||
24 | index 4a59b68e..0d5ad90f 100644 | ||
25 | --- a/include/wrapper/genhd.h | ||
26 | +++ b/include/wrapper/blkdev.h | ||
27 | @@ -1,6 +1,6 @@ | ||
28 | /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) | ||
29 | * | ||
30 | - * wrapper/genhd.h | ||
31 | + * wrapper/blkdev.h | ||
32 | * | ||
33 | * wrapper around block layer functions and data structures. Using | ||
34 | * KALLSYMS to get its address when available, else we need to have a | ||
35 | @@ -9,8 +9,8 @@ | ||
36 | * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
37 | */ | ||
38 | |||
39 | -#ifndef _LTTNG_WRAPPER_GENHD_H | ||
40 | -#define _LTTNG_WRAPPER_GENHD_H | ||
41 | +#ifndef _LTTNG_WRAPPER_BLKDEV_H | ||
42 | +#define _LTTNG_WRAPPER_BLKDEV_H | ||
43 | |||
44 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) | ||
45 | #include <linux/blkdev.h> | ||
46 | @@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) | ||
47 | /* | ||
48 | * Canary function to check for 'block_class' at compile time. | ||
49 | * | ||
50 | - * From 'include/linux/genhd.h': | ||
51 | + * From 'include/linux/blkdev.h': | ||
52 | * | ||
53 | * extern struct class block_class; | ||
54 | */ | ||
55 | @@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) | ||
56 | |||
57 | #endif | ||
58 | |||
59 | -#endif /* _LTTNG_WRAPPER_GENHD_H */ | ||
60 | +#endif /* _LTTNG_WRAPPER_BLKDEV_H */ | ||
61 | diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c | ||
62 | index 4d7b2921..0e753090 100644 | ||
63 | --- a/src/lttng-statedump-impl.c | ||
64 | +++ b/src/lttng-statedump-impl.c | ||
65 | @@ -41,7 +41,7 @@ | ||
66 | #include <wrapper/namespace.h> | ||
67 | #include <wrapper/irq.h> | ||
68 | #include <wrapper/tracepoint.h> | ||
69 | -#include <wrapper/genhd.h> | ||
70 | +#include <wrapper/blkdev.h> | ||
71 | #include <wrapper/file.h> | ||
72 | #include <wrapper/fdtable.h> | ||
73 | #include <wrapper/sched.h> | ||
74 | -- | ||
75 | 2.19.1 | ||
76 | |||