diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-25 21:17:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-25 21:17:48 +0300 |
| commit | cca316f3562afea7efa35acdd84ed899e23e6e29 (patch) | |
| tree | 110dfd4447ba997d36b80e2e534ae234ecd18eef /include/linux | |
| parent | 60b1af3300724d211bb0b420c1fbe6bf5b87b013 (diff) | |
| parent | a67edbf4fb6deadcfe57a04a134abed4a5ba3bb5 (diff) | |
| download | linux-cca316f3562afea7efa35acdd84ed899e23e6e29.tar.xz | |
Merge branch 'bpf-tracepoints'
Daniel Borkmann says:
====================
BPF tracepoints
This set adds tracepoints to BPF for better introspection and
debugging. The first two patches are prerequisite for the actual
third patch that adds the tracepoints. I think the first two are
small and straight forward enough that they could ideally go via
net-next, but I'm also open to other suggestions on how to route
them in case that's not applicable (it would reduce potential
merge conflicts on BPF side, though). For details, please see
individual patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bpf_trace.h | 7 | ||||
| -rw-r--r-- | include/linux/trace_events.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/bpf_trace.h b/include/linux/bpf_trace.h new file mode 100644 index 000000000000..b22efbdd2eb4 --- /dev/null +++ b/include/linux/bpf_trace.h @@ -0,0 +1,7 @@ +#ifndef __LINUX_BPF_TRACE_H__ +#define __LINUX_BPF_TRACE_H__ + +#include <trace/events/bpf.h> +#include <trace/events/xdp.h> + +#endif /* __LINUX_BPF_TRACE_H__ */ diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index be007610ceb0..cfa475a0e9ca 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -33,7 +33,8 @@ const char *trace_print_bitmask_seq(struct trace_seq *p, void *bitmask_ptr, unsigned int bitmask_size); const char *trace_print_hex_seq(struct trace_seq *p, - const unsigned char *buf, int len); + const unsigned char *buf, int len, + bool spacing); const char *trace_print_array_seq(struct trace_seq *p, const void *buf, int count, |