History

tools: Synchronize tools/include/uapi/linux/bpf.h

Commit 747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming") renames BPF_FUNC_skb_in_cgroup to bpf_skb_under_cgroup, triggering this warning while building perf: Warning: tools/include/uapi/linux/bpf.h differs from kernel Update the copy to ack that, no changes needed, as BPF_FUNC_skb_in_cgroup isn't used so far.

Arnaldo Carvalho de Melo committed 10 years ago

Commit dcfc3a61 parent a5c4c741 file · +2 −2Browse files

Unified · Split

tools/include/uapi/linux/bpf.h+2−2
@@ -339,7 +339,7 @@ enum bpf_func_id { · 338 unmodified lines
339339 BPF_FUNC_skb_change_type,
340340
341341 /**
342− * bpf_skb_in_cgroup(skb, map, index) - Check cgroup2 membership of skb
342+ * bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb
343343 * @skb: pointer to skb
344344 * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
345345 * @index: index of the cgroup in the bpf_map
@@ -348,7 +348,7 @@ enum bpf_func_id { · 2 unmodified lines
348348 * == 1 skb succeeded the cgroup2 descendant test
349349 * < 0 error
350350 */
351− BPF_FUNC_skb_in_cgroup,
351+ BPF_FUNC_skb_under_cgroup,
352352
353353 /**
354354 * bpf_get_hash_recalc(skb)