From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2563FC48BD8 for ; Wed, 26 Jun 2019 10:38:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5CDA205F4 for ; Wed, 26 Jun 2019 10:38:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jwIaGN1W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727275AbfFZKiq (ORCPT ); Wed, 26 Jun 2019 06:38:46 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35825 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726851AbfFZKim (ORCPT ); Wed, 26 Jun 2019 06:38:42 -0400 Received: by mail-lj1-f196.google.com with SMTP id x25so1674113ljh.2 for ; Wed, 26 Jun 2019 03:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=7/7ThqJsHZEC1k6/iKremUj3hn4/MicnKE4/aT1gNsA=; b=jwIaGN1WLQvvoZpKTt5omB84aC8rELXROrOqHTju1pFE/gX3muJ+LvqaoL8c2seXb/ vegxwJh3qQD8GK50OyLjQOu4/kkWbzlPkvEQmLBZU1Y+eEDjNKsIg785Ld/Q/ONf4sN3 yyzJWMZeOqe9JKH+t76WHopIaSweZ6sJuNq8vZNPeuFnKkIEHPKDBzeDMqr6jOjw2R3Y FXs5yQ9UdU463EB3n5hJFH/Kke6R6KK38+DFpNJ/MJU1ArsCYdYXorNDBP3poUP/o/HH AlNFR7BbFfgyAgaEETNNRA5/ED9Yaz58fYEQrH7M4E1uSFr3HUdDV9nV+ynJy/cYsPxX x40g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7/7ThqJsHZEC1k6/iKremUj3hn4/MicnKE4/aT1gNsA=; b=Tr5+R7e/oQXLSwollird+VfWPkJ6sRWz/jvrI4QnIYkFR+XuprZrpPkWK70mqxhxnP mK1b/DYfltL61drrdwccXs6pFVQQwtrOJ0/Fgf8EIjQxd2hVSH7YSxdByjPJ+/5QmEck 4ul9SHo3pJzmofY224qk0/EzVqZt+xzUytQyXcQU1pzOpA6wAPC7W9b8I6ETyACD5IO3 iiSJky6sjG4DxYvUbH+DQZzKml7jpeDKkqiIdmjiJrHTLu8fJKJRvmxJfiQB0elD8K+s BehPFDjfTNEsGFC7/yl4h8tencCC6bh2c6m02g4aBH2C4C5Hp66gYXlEJafLLzttqtcB laQg== X-Gm-Message-State: APjAAAVgU1rt2yMaubJn/WgqpBtlgIn+8jVCDkaLhBfeFaBJ4txLPzhb ZolThtd+jKAHduHg1cwfC6Wdjg== X-Google-Smtp-Source: APXvYqzIqruQr8skHJ7Cy/6zMhRHvz6kDHzz29lP7IOisG1D63w3LH9uBcrRddtDh9BzphIUEDvbYg== X-Received: by 2002:a2e:730d:: with SMTP id o13mr2317536ljc.81.1561545520323; Wed, 26 Jun 2019 03:38:40 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id 80sm2372230lfz.56.2019.06.26.03.38.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 26 Jun 2019 03:38:39 -0700 (PDT) From: Ivan Khoronzhuk To: ast@kernel.org, netdev@vger.kernel.org Cc: daniel@iogearbox.net, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH v2 bpf-next] libbpf: fix max() type mismatch for 32bit Date: Wed, 26 Jun 2019 13:38:37 +0300 Message-Id: <20190626103837.6455-1-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It fixes build error for 32bit caused by type mismatch size_t/unsigned long. Fixes: bf82927125dd ("libbpf: refactor map initialization") Acked-by: Song Liu Acked-by: Andrii Nakryiko Signed-off-by: Ivan Khoronzhuk --- 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