diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 19:20:14 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 19:20:14 +0300 |
| commit | 08a7c7772b4db0be06e3b27239147c0a36e2a507 (patch) | |
| tree | af653cb85a263ac19334cdaa74ecd58f909c5cef /tools/include | |
| parent | b13b04d9382113f787e21c9567a4022fef8697b9 (diff) | |
| parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) | |
| download | linux-08a7c7772b4db0be06e3b27239147c0a36e2a507.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To get some newer headers that got out of sync with the copies in tools/
so that we can try to have the tools/perf/ build clean for v5.8 with
fewer pull requests.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/linux/kallsyms.h | 2 | ||||
| -rw-r--r-- | tools/include/uapi/linux/bpf.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/tools/include/linux/kallsyms.h b/tools/include/linux/kallsyms.h index 89ca6fe257cc..efb6c3f5f2a9 100644 --- a/tools/include/linux/kallsyms.h +++ b/tools/include/linux/kallsyms.h @@ -20,7 +20,7 @@ static inline const char *kallsyms_lookup(unsigned long addr, #include <execinfo.h> #include <stdlib.h> -static inline void print_ip_sym(unsigned long ip) +static inline void print_ip_sym(const char *loglvl, unsigned long ip) { char **name; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index c65b374a5090..19684813faae 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3761,6 +3761,19 @@ struct xdp_md { __u32 egress_ifindex; /* txq->dev->ifindex */ }; +/* DEVMAP map-value layout + * + * The struct data-layout of map-value is a configuration interface. + * New members can only be added to the end of this structure. + */ +struct bpf_devmap_val { + __u32 ifindex; /* device index */ + union { + int fd; /* prog fd on map write */ + __u32 id; /* prog id on map read */ + } bpf_prog; +}; + enum sk_action { SK_DROP = 0, SK_PASS, |