Skip to contentSkip to conversation

Patch "perf data: Fix building in 32 bit platform with libbabeltrace" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 29, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf data: Fix building in 32 bit platform with libbabeltrace

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-data-fix-building-in-32-bit-platform-with-libbabeltrace.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f2c8852e6e990fcab0d9e68de9d86e5fbea0b5dc Mon Sep 17 00:00:00 2001

From: Wang Nan <[email protected]>
Date: Wed, 28 Sep 2016 03:58:46 +0000
Subject: perf data: Fix building in 32 bit platform with libbabeltrace

From: Wang Nan <[email protected]>

commit f2c8852e6e990fcab0d9e68de9d86e5fbea0b5dc upstream.

On ARM32 building it report following error when we build with libbabeltrace:

util/data-convert-bt.c: In function 'add_bpf_output_values':
util/data-convert-bt.c:440:3: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Werror=format]
cc1: all warnings being treated as errors

Fix it by changing %lu to %zu.

Cc Jiri Olsa <[email protected]>
Cc Zefan Li <[email protected]>
Fixes 6122d57e9f7c ("perf data: Support converting data from bpf_perf_event_output()")
---
 tools/perf/util/data-convert-bt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/data-convert-bt.c +1 -1
@@ -437,7 +437,7 @@ add_bpf_output_values(struct bt_ctf_even
 	int ret;
 
 	if (nr_elements * sizeof(u32) != raw_size)
-		pr_warning("Incorrect raw_size (%u) in bpf output event, skip %lu bytes\n",
+		pr_warning("Incorrect raw_size (%u) in bpf output event, skip %zu bytes\n",
 			   raw_size, nr_elements * sizeof(u32) - raw_size);
 
 	len_type = bt_ctf_event_class_get_field_by_name(event_class, "raw_len");

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/perf-data-fix-building-in-32-bit-platform-with-libbabeltrace.patch queue-4.8/perf-symbols-check-symbol_conf.allow_aliases-for-kallsyms-loading-too.patch queue-4.8/perf-symbols-fixup-symbol-sizes-before-picking-best-ones.patch