[PATCH v2 bpf-next] libbpf: fix max() type mismatch for 32bit

* [PATCH v2 bpf-next] libbpf: fix max() type mismatch for 32bit
@ 2019-06-26 10:38 Ivan Khoronzhuk
  2019-06-26 14:32 ` Daniel Borkmann
  0 siblings, 1 reply; 2+ messages in thread
From: Ivan Khoronzhuk @ 2019-06-26 10:38 UTC (permalink / raw)
  To: ast, netdev; +Cc: daniel, bpf, linux-kernel, Ivan Khoronzhuk

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

Fixes: bf82927125dd ("libbpf: refactor map initialization")
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
---
 tools/lib/bpf/libbpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 68f45a96769f..5186b7710430 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -778,7 +778,7 @@ static struct bpf_map *bpf_object__add_map(struct bpf_object *obj)
 	if (obj->nr_maps < obj->maps_cap)
 		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));
 	if (!new_maps) {
 		pr_warning("alloc maps for object failed\n");
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread