Commit dcfc3a67 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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

Commit 747ea55e ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a5c4c745

tools/include/uapi/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ enum bpf_func_id { 
	BPF_FUNC_skb_change_type,



	/**

	 * bpf_skb_in_cgroup(skb, map, index) - Check cgroup2 membership of skb

	 * bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb

	 * @skb: pointer to skb

	 * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type

	 * @index: index of the cgroup in the bpf_map
@@ -348,7 +348,7 @@ enum bpf_func_id { 
	 *   == 1 skb succeeded the cgroup2 descendant test

	 *    < 0 error

	 */

	BPF_FUNC_skb_in_cgroup,

	BPF_FUNC_skb_under_cgroup,



	/**

	 * bpf_get_hash_recalc(skb)