Skip to contentSkip to conversation

lttng-modules: update to 2.11.2

PATCH New Daniel Dragomir 1 participant 1 message Mar 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lttng-modules: update to 2.11.2

Upgrade to version 2.11.2 in order to fix some build errors with latest 5.4 kernel.

- conflicting types for 'trace_fast_page_fault' Reproductible on kernel greater than v5.4.19, starting with commit 8a1cd01bee ("KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM")

Error messages:
lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6:
error:
130 | void trace_##_name(_proto);
tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21:
note: previous definition of 'trace_fast_page_fault' was here
233 | static inline void trace_##name(proto)

- conflicting types for 'trace_rcu_dyntick' Reproductible on kernel greater than v5.4.22, starting with commit 6cf539a87a ("rcu: Fix data-race due to atomic_t copy-by-value")

Error messages:
lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6:
error: conflicting types for 'trace_rcu_dyntick'
130 | void trace_##_name
tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21:
note: previous definition of 'trace_rcu_dyntick' was here
233 | static inline void trace_##name(proto)

---
 .../{lttng-modules_2.11.1.bb => lttng-modules_2.11.2.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.11.1.bb => lttng-modules_2.11.2.bb} (86%)
meta/recipes-kernel/lttng/lttng-modules_2.11.2.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb +4 -4
similarity index 86%
rename from meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.11.2.bb
index c833ff7009..6fff096a37 100644
@@ -13,8 +13,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
-SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604"
-SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1"
+SRC_URI[md5sum] = "2e3bc8cfb264fa13f374618b46f170e7"
+SRC_URI[sha256sum] = "8a42240813b8fd1d001835cd6f5ec687f7d7f3b26070d4e21604c35a51a6441d"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
@@ -37,7 +37,7 @@ SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.1
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
-SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a"
-PV_class-devupstream = "2.11.1+git${SRCPV}"
+SRCREV_class-devupstream = "17c413953603f063f2a9d6c3788bec914ce6f955"
+PV_class-devupstream = "2.11.2+git${SRCPV}"
 S_class-devupstream = "${WORKDIR}/git"
 SRCREV_FORMAT ?= "lttng_git"
Signature · 1 line
2.17.1