Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758216AbcLTT1q (ORCPT ); Tue, 20 Dec 2016 14:27:46 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35848 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753031AbcLTT1l (ORCPT ); Tue, 20 Dec 2016 14:27:41 -0500 Date: Tue, 20 Dec 2016 11:27:11 -0800 From: tip-bot for Joe Stringer Message-ID: Cc: acme@redhat.com, ast@fb.com, wangnan0@huawei.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, joe@ovn.org, daniel@iogearbox.net Reply-To: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, daniel@iogearbox.net, linux-kernel@vger.kernel.org, joe@ovn.org, wangnan0@huawei.com, acme@redhat.com, ast@fb.com In-Reply-To: <20161209024620.31660-3-joe@ovn.org> References: <20161209024620.31660-3-joe@ovn.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools lib bpf: use __u32 from linux/types.h Git-Commit-ID: 83d994d02bf4594d6bfa9b2b67befb6cff7f9380 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 Content-Length: 2282 Lines: 64 Commit-ID: 83d994d02bf4594d6bfa9b2b67befb6cff7f9380 Gitweb: http://git.kernel.org/tip/83d994d02bf4594d6bfa9b2b67befb6cff7f9380 Author: Joe Stringer AuthorDate: Thu, 8 Dec 2016 18:46:15 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 15 Dec 2016 16:25:46 -0300 tools lib bpf: use __u32 from linux/types.h Fixes the following issue when building without access to 'u32' type: ./tools/lib/bpf/bpf.h:27:23: error: unknown type name ‘u32’ Signed-off-by: Joe Stringer Acked-by: Wang Nan Cc: Alexei Starovoitov Cc: Daniel Borkmann Link: http://lkml.kernel.org/r/20161209024620.31660-3-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/bpf.c | 4 ++-- tools/lib/bpf/bpf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 8143536..89e8e8e 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -70,7 +70,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, size_t log_buf_sz) + __u32 kern_version, char *log_buf, size_t log_buf_sz) { int fd; union bpf_attr attr; @@ -98,7 +98,7 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, } int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags) + __u64 flags) { union bpf_attr attr; diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 253c3db..6113017 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -30,11 +30,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, #define BPF_LOG_BUF_SIZE 65536 int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, size_t insns_cnt, char *license, - u32 kern_version, char *log_buf, + __u32 kern_version, char *log_buf, size_t log_buf_sz); int bpf_map_update_elem(int fd, void *key, void *value, - u64 flags); + __u64 flags); int bpf_map_lookup_elem(int fd, void *key, void *value); int bpf_map_delete_elem(int fd, void *key);