| From f2c8852e6e990fcab0d9e68de9d86e5fbea0b5dc Mon Sep 17 00:00:00 2001 |
| From: Wang Nan <wangnan0@huawei.com> |
| Date: Wed, 28 Sep 2016 03:58:46 +0000 |
| Subject: perf data: Fix building in 32 bit platform with libbabeltrace |
| |
| From: Wang Nan <wangnan0@huawei.com> |
| |
| 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. |
| |
| Signed-off-by: Wang Nan <wangnan0@huawei.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: Zefan Li <lizefan@huawei.com> |
| Cc: pi3orama@163.com |
| Fixes: 6122d57e9f7c ("perf data: Support converting data from bpf_perf_event_output()") |
| Link: http://lkml.kernel.org/r/1475035126-146587-1-git-send-email-wangnan0@huawei.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/util/data-convert-bt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/tools/perf/util/data-convert-bt.c |
| +++ b/tools/perf/util/data-convert-bt.c |
| @@ -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"); |
