Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933203AbcLID2n (ORCPT ); Thu, 8 Dec 2016 22:28:43 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:3343 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932932AbcLID2l (ORCPT ); Thu, 8 Dec 2016 22:28:41 -0500 Subject: Re: [PATCHv3 perf/core 2/7] tools lib bpf: use __u32 from linux/types.h To: Joe Stringer , References: <20161209024620.31660-1-joe@ovn.org> <20161209024620.31660-3-joe@ovn.org> CC: , , , From: "Wangnan (F)" Message-ID: <1d2b9c76-32cf-f810-22f2-00dc1c679260@huawei.com> Date: Fri, 9 Dec 2016 11:28:19 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20161209024620.31660-3-joe@ovn.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.111.194.139] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1973 Lines: 58 On 2016/12/9 10:46, Joe Stringer wrote: > 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 > --- > v3: Split from "tools lib bpf: Sync with samples/bpf/libbpf" > --- > tools/lib/bpf/bpf.c | 4 ++-- > tools/lib/bpf/bpf.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Acked-by: Wang Nan > diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c > index 8143536b462a..89e8e8e5b60e 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 253c3dbb06b4..61130170a6ad 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);