From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935688AbcJFWno (ORCPT ); Thu, 6 Oct 2016 18:43:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46480 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935626AbcJFWnb (ORCPT ); Thu, 6 Oct 2016 18:43:31 -0400 Date: Thu, 6 Oct 2016 15:43:07 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, daniel@iogearbox.net, acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, adrian.hunter@intel.com, namhyung@kernel.org, jolsa@kernel.org, davem@davemloft.net, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, dsahern@gmail.com, davem@davemloft.net, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, wangnan0@huawei.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, daniel@iogearbox.net, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools: Synchronize tools/include/uapi/linux/bpf.h Git-Commit-ID: dcfc3a6740d372ebe203dae2c5852ff45f9ef793 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dcfc3a6740d372ebe203dae2c5852ff45f9ef793 Gitweb: http://git.kernel.org/tip/dcfc3a6740d372ebe203dae2c5852ff45f9ef793 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 5 Oct 2016 19:31:48 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Oct 2016 19:31:48 -0300 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 Cc: Daniel Borkmann Cc: David Ahern Cc: David S. Miller Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-x67d2gq8ct6ko12ex14q8bbx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/bpf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index da218fe..9e5fc16 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -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)