Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-x67d2gq8ct6ko12ex14q8bbx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+2 -2
+2 -2
tools/include/uapi/linux/bpf.h
··· 339 339 BPF_FUNC_skb_change_type, 340 340 341 341 /** 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 343 343 * @skb: pointer to skb 344 344 * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type 345 345 * @index: index of the cgroup in the bpf_map ··· 348 348 * == 1 skb succeeded the cgroup2 descendant test 349 349 * < 0 error 350 350 */ 351 - BPF_FUNC_skb_in_cgroup, 351 + BPF_FUNC_skb_under_cgroup, 352 352 353 353 /** 354 354 * bpf_get_hash_recalc(skb)