admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'torvalds/master' into perf/core

Browse Source 
To pick up some tools/perf/ patches that went via tip/perf/core, such
as:

  tools/perf: Add mem_hops field in perf_mem_data_src structure

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2021-11-06 15:49:33 -03:00
parent 32f7aa2731 fe91c4725a
commit 7f9f879243
9143 changed files with 569725 additions and 193780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/bpf-event.c
View File

@@ -109,7 +109,7 @@ static int perf_env__fetch_btf(struct perf_env *env,
u32 data_size;
const void *data;
data = btf__get_raw_data(btf, &data_size);
data = btf__raw_data(btf, &data_size);
node = malloc(data_size + sizeof(struct btf_node));
if (!node)