diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2016-07-18 15:50:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-19 19:27:01 -0700 |
| commit | 183fc1537ec39be242dc8b619f71fc11b393d295 (patch) | |
| tree | e18fa01b3097c5e2d699838098fe7e4d453d296e /kernel/trace | |
| parent | a725ee3e44e39dab1ec82cc745899a785d2a555e (diff) | |
| download | linux-stable-183fc1537ec39be242dc8b619f71fc11b393d295.tar.gz linux-stable-183fc1537ec39be242dc8b619f71fc11b393d295.tar.bz2 linux-stable-183fc1537ec39be242dc8b619f71fc11b393d295.zip | |
kernel/trace/bpf_trace.c: work around gcc-4.4.4 anon union initialization bug
kernel/trace/bpf_trace.c: In function 'bpf_event_output':
kernel/trace/bpf_trace.c:312: error: unknown field 'next' specified in initializer
kernel/trace/bpf_trace.c:312: warning: missing braces around initializer
kernel/trace/bpf_trace.c:312: warning: (near initialization for 'raw.frag.<anonymous>')
Fixes: 555c8a8623a3a87 ("bpf: avoid stack copy and use skb ctx for event output")
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index ebfbb7dd7033..a12bbd32c0a6 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -309,7 +309,9 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size, }; struct perf_raw_record raw = { .frag = { - .next = ctx_size ? &frag : NULL, + { + .next = ctx_size ? &frag : NULL, + }, .size = meta_size, .data = meta, }, |