summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-05-15 11:45:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-16 08:29:59 +0100
commit4f7ea3fef7278d0f1f521b346a2cbe87aa2b9202 (patch)
treed29f7990c44f31c077903030aebdc7ba3c056baf /meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch
parentf98ea33f637a95d166691d1dfa2fe546be840d4d (diff)
downloadpoky-4f7ea3fef7278d0f1f521b346a2cbe87aa2b9202.tar.gz
lttng-modules: update to v2.12.6
To support building against v5.12+ and v5.13+ kernels, bumping to the v2.12.6 lttng-release. We drop the previously backported patches, and bring in the following commits: 0d8e4ab9 Version 2.12.6 78f56ae3 fix: adjust ranges for RHEL 8.2 and 8.3 4c996ea7 Disable block rwbs bitwise enum in default build 4ac46085 Disable sched_switch bitwise enum in default build 5e22c27b Add experimental bitwise enum config option 937d307e Add defaults to Kconfig options 4a114d43 Sync `show_inode_state()` macro with upstream stable kernels 3bd6ac3e fix: block: remove disk_part_iter (v5.12) 8bbb8c9d Fix: Backport of "Fix: increment buffer offset when failing to copy from user-space" 30cddf69 Fix: increment buffer offset when failing to copy from user-space 4733b9ab Sync `show_inode_state()` macro with Ubuntu 4.15 kernel ff21ec48 fix: mm, tracing: kfree event name mismatching with provider kmem (v5.12) b2b02c29 Set 'stable-2.12' branch in git review config 00b42dbf fix backport: block: add a disk_uevent helper (v5.12) 771ff089 fix: Adjust ranges for Ubuntu 5.4.0-67 kernel d8933959 fix: block: add a disk_uevent helper (v5.12) 71034df1 Fix: properly compare type enumeration 4d879d23 compiler warning cleanup: is_signed_type: compare -1 to 1 fead3a9c Fix: bytecode linker: validate event and field array/sequence encoding 92cc3e7f Fix: kretprobe: null ptr deref on session destroy 49c603ef fix: mm, tracing: record slab name for kmem_cache_free() (v5.12) 23a2f61f Fix: filter interpreter early-exits on uninitialized value b3fdf78b Fix: memory leaks on event destroy (From OE-Core rev: c2f027b8e2f842915a0ffdfd6c2c0597f3b02bce) 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/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.patch48
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 @@
1From 127135b6a45d5fca828815c62308f72de97e5739 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Thu, 15 Apr 2021 13:56:24 -0400
4Subject: [PATCH 3/4] fix backport: block: add a disk_uevent helper (v5.12)
5
6Upstream-Status: Backport [2.12.6]
7
8Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
9Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
10Change-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
17diff --git a/src/wrapper/genhd.c b/wrapper/genhd.c
18similarity index 98%
19rename from src/wrapper/genhd.c
20rename to wrapper/genhd.c
21index 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
33diff --git a/wrapper/genhd.h b/wrapper/genhd.h
34index 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--
472.25.1
48