diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch deleted file mode 100644 index e32b3e7a2e..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 127135b6a45d5fca828815c62308f72de97e5739 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Thu, 15 Apr 2021 13:56:24 -0400 | ||
4 | Subject: [PATCH 3/4] fix backport: block: add a disk_uevent helper (v5.12) | ||
5 | |||
6 | Upstream-Status: Backport [2.12.6] | ||
7 | |||
8 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
9 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
10 | Change-Id: I717162069990577abe78e5e7fed28816f32b2c84 | ||
11 | --- | ||
12 | {src/wrapper => wrapper}/genhd.c | 2 +- | ||
13 | wrapper/genhd.h | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | rename {src/wrapper => wrapper}/genhd.c (98%) | ||
16 | |||
17 | diff --git a/src/wrapper/genhd.c b/wrapper/genhd.c | ||
18 | similarity index 98% | ||
19 | rename from src/wrapper/genhd.c | ||
20 | rename to wrapper/genhd.c | ||
21 | index a5a6c410..cbec06f7 100644 | ||
22 | --- a/src/wrapper/genhd.c | ||
23 | +++ b/wrapper/genhd.c | ||
24 | @@ -9,7 +9,7 @@ | ||
25 | * Copyright (C) 2021 Michael Jeanson <mjeanson@efficios.com> | ||
26 | */ | ||
27 | |||
28 | -#include <lttng/kernel-version.h> | ||
29 | +#include <lttng-kernel-version.h> | ||
30 | #include <linux/module.h> | ||
31 | #include <wrapper/genhd.h> | ||
32 | |||
33 | diff --git a/wrapper/genhd.h b/wrapper/genhd.h | ||
34 | index 6bae239d..1b4a4201 100644 | ||
35 | --- a/wrapper/genhd.h | ||
36 | +++ b/wrapper/genhd.h | ||
37 | @@ -13,7 +13,7 @@ | ||
38 | #define _LTTNG_WRAPPER_GENHD_H | ||
39 | |||
40 | #include <linux/genhd.h> | ||
41 | -#include <lttng/kernel-version.h> | ||
42 | +#include <lttng-kernel-version.h> | ||
43 | |||
44 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) | ||
45 | #define LTTNG_DISK_PART_TYPE struct block_device | ||
46 | -- | ||
47 | 2.25.1 | ||
48 | |||