diff options
Diffstat (limited to 'tools/perf/util/bpf-event.c')
| -rw-r--r-- | tools/perf/util/bpf-event.c | 28 | 
1 files changed, 19 insertions, 9 deletions
diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index 94624733af7e..eee64ddb766d 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -22,7 +22,8 @@  #include "record.h"  #include "util/synthetic-events.h" -struct btf * __weak btf__load_from_kernel_by_id(__u32 id) +#ifndef HAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID +struct btf *btf__load_from_kernel_by_id(__u32 id)  {         struct btf *btf;  #pragma GCC diagnostic push @@ -32,12 +33,14 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id)         return err ? ERR_PTR(err) : btf;  } +#endif -int __weak bpf_prog_load(enum bpf_prog_type prog_type, -			 const char *prog_name __maybe_unused, -			 const char *license, -			 const struct bpf_insn *insns, size_t insn_cnt, -			 const struct bpf_prog_load_opts *opts) +#ifndef HAVE_LIBBPF_BPF_PROG_LOAD +int bpf_prog_load(enum bpf_prog_type prog_type, +		  const char *prog_name __maybe_unused, +		  const char *license, +		  const struct bpf_insn *insns, size_t insn_cnt, +		  const struct bpf_prog_load_opts *opts)  {  #pragma GCC diagnostic push  #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -45,8 +48,10 @@ int __weak bpf_prog_load(enum bpf_prog_type prog_type,  				opts->kern_version, opts->log_buf, opts->log_size);  #pragma GCC diagnostic pop  } +#endif -struct bpf_program * __weak +#ifndef HAVE_LIBBPF_BPF_OBJECT__NEXT_PROGRAM +struct bpf_program *  bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)  {  #pragma GCC diagnostic push @@ -54,8 +59,10 @@ bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)  	return bpf_program__next(prev, obj);  #pragma GCC diagnostic pop  } +#endif -struct bpf_map * __weak +#ifndef HAVE_LIBBPF_BPF_OBJECT__NEXT_MAP +struct bpf_map *  bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)  {  #pragma GCC diagnostic push @@ -63,8 +70,10 @@ bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)  	return bpf_map__next(prev, obj);  #pragma GCC diagnostic pop  } +#endif -const void * __weak +#ifndef HAVE_LIBBPF_BTF__RAW_DATA +const void *  btf__raw_data(const struct btf *btf_ro, __u32 *size)  {  #pragma GCC diagnostic push @@ -72,6 +81,7 @@ btf__raw_data(const struct btf *btf_ro, __u32 *size)  	return btf__get_raw_data(btf_ro, size);  #pragma GCC diagnostic pop  } +#endif  static int snprintf_hex(char *buf, size_t size, unsigned char *data, size_t len)  {  | 
