Commit 95064979 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Daniel Borkmann

libbpf: fix max() type mismatch for 32bit

It fixes build error for 32bit caused by type mismatch
size_t/unsigned long.

Fixes: bf829271 ("libbpf: refactor map initialization")
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 9cda7807
...@@ -778,7 +778,7 @@ static struct bpf_map *bpf_object__add_map(struct bpf_object *obj) ...@@ -778,7 +778,7 @@ static struct bpf_map *bpf_object__add_map(struct bpf_object *obj)
if (obj->nr_maps < obj->maps_cap) if (obj->nr_maps < obj->maps_cap)
return &obj->maps[obj->nr_maps++]; return &obj->maps[obj->nr_maps++];
new_cap = max(4ul, obj->maps_cap * 3 / 2); new_cap = max((size_t)4, obj->maps_cap * 3 / 2);
new_maps = realloc(obj->maps, new_cap * sizeof(*obj->maps)); new_maps = realloc(obj->maps, new_cap * sizeof(*obj->maps));
if (!new_maps) { if (!new_maps) {
pr_warning("alloc maps for object failed\n"); pr_warning("alloc maps for object failed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment