summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2018-07-10 18:03:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:41 +0100
commit05940897063ca9de93a16294b685645f8ad37f76 (patch)
tree14accd6ed08127522d2679a79676d05be738ff87 /meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb
parentba598c7db375364a09cbb159092327c322751a97 (diff)
downloadpoky-05940897063ca9de93a16294b685645f8ad37f76.tar.gz
lttng-modules: Fix do_compile failure for btrfs related tracepoints
Building lttng-modules with linux-yocto-dev will cause do_compile failure: lttng-modules/2.10.6-r0/lttng-modules-2.10.6/probes/../probes/lttng-tracepoint-event-impl.h:143:6: error: conflicting types for 'trace_btrfs_reserve_extent' void trace_##_name(_proto); ^~~~~~ The following commit from latest mainline kernel changes some btrfs functions' prototype. 3dca5c942dac60164e6a6e89172f25b86af07ce7 "btrfs: trace: Remove unnecessary fs_info parameter for btrfs__reserve_extent event class" This patch backports a commit from upstream to meet the above changes. 51ab0b1da29354375a19f865abcd233dd2178295 "Fix: btrfs: Remove unnecessary fs_info parameter" (From OE-Core rev: c1daa5c0b89cdfab15d2fa093b021b2ce0937dad) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb
index 6146966894..d9d5588f9a 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb
@@ -14,6 +14,7 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
14SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
15 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ 15 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
16 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ 16 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
17 file://0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch \
17" 18"
18 19
19SRC_URI[md5sum] = "8110099f4615fc89a74ffe9189b56cfc" 20SRC_URI[md5sum] = "8110099f4615fc89a74ffe9189b56cfc"