From patchwork Fri May 5 19:46:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98663 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292679qge; Fri, 5 May 2017 12:48:18 -0700 (PDT) X-Received: by 10.98.86.207 with SMTP id h76mr3659736pfj.205.1494013698322; Fri, 05 May 2017 12:48:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.18; Fri, 05 May 2017 12:48:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755485AbdEETsQ (ORCPT + 6 others); Fri, 5 May 2017 15:48:16 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:61723 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbdEETsN (ORCPT ); Fri, 5 May 2017 15:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6alo-1e0b0u2Kpw-00wQwL; Fri, 05 May 2017 21:48:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 13/87] infiniband: mlx5: avoid a compile-time warning Date: Fri, 5 May 2017 21:46:31 +0200 Message-Id: <20170505194745.3627137-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:AtYDhaFzefRoAeW1GIoX9eYOJRINzUbPVYMD/NZ9/d2IhvL7x2d szWtXVBUSwMNhtl5KdeDpzJ22uzza4tJUFYrYZDrdb13KpeoQBQ+7hakhQimSMGT3EXeMlA iPHtX3GjVVNEHs81N1zLuu166TBUl5JkaArWZ50cZV5FN/yKZXFgmEWyQvLO/nwWtMLRkOT VcwnmJne/Cgdz2J4tgzKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:9S3DV928fAw=:Dc8Vls3NJ764cBLQhhIey3 pelYUjroD1mr9Ad68keKqCGxLWqWYeNgsFYECuqR4t2LV3aNiyr8thne0tkCENs6IJBgCY3wz Q1i5ezNf4K1sEf4KTWasb1zEzVeH3zE5xNVmFjCqz4ZQK86ztQ9UGiBIjP2pat7UfgVlAxAZk /vGYFbIRngx+jKI5r9WMHKVIpGAB+39IlOg0Our/pvVUcZAu9jjg5wyueeIZCBEJW67ivbXWp eyyrGQXksLlJBUQkkr85g8Zv76PdfX7dc6g1S/ZtEkc3tYLOKJnQgMrRhzxSdtEjIpbMmkgJn IttDVAedDFGRn8sX21e7KTgeNOvsHwsYI8pGFYl6bAPdPndcCwpWtCYB4cNuqx4Hs9diV33Uj mnTMHG3/8vPB3/942hUOgT6picG/D/2cDLHBaWrfV6CreI/1xcgzgC/ga7/MF2wEiufZonyXw vCMiVq6+JK2pYirfsqBQGOHpASqdpN4H+dJPLA7yVK2C2sH5xuKvdp6tPm9A98w0M0E0OvYf1 KlntUmqBQx0WgjFHO+44YUKZ6xsPellLdTw0MypdOUnGB3VgCvdJUSBPyXhP2MxED7ADnRxAF Ix+hJmiwt+1no6PwlXiliub/cTDjYqeqhz6f88/zBkT0GxK++5u2nxb/ZR5KkfumRXisBl3j9 unWxrBUqL/IP2RwgzuAuCmpE3odVQgJ+dehRO/CtJWB5FaYKwb5IXyFJCXULIgGbdA4E= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 7835bfb5261501590a508b3de3379e2231cb4853 upstream. The return type of find_first_bit() is architecture specific, on ARM it is 'unsigned int', while the asm-generic code used on x86 and a lot of other architectures returns 'unsigned long'. When building the mlx5 driver on ARM, we get a warning about this: infiniband/hw/mlx5/mem.c: In function 'mlx5_ib_cont_pages': infiniband/hw/mlx5/mem.c:84:143: warning: comparison of distinct pointer types lacks a cast m = min(m, find_first_bit(&tmp, sizeof(tmp))); This patch changes the driver to use min_t to make it behave the same way on all architectures. Signed-off-by: Arnd Bergmann Acked-by: Eli Cohen Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/infiniband/hw/mlx5/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c index 8499aec94db6..deff377934ff 100644 --- a/drivers/infiniband/hw/mlx5/mem.c +++ b/drivers/infiniband/hw/mlx5/mem.c @@ -68,7 +68,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, for (k = 0; k < len; k++) { if (!(i & mask)) { tmp = (unsigned long)pfn; - m = min(m, find_first_bit(&tmp, sizeof(tmp))); + m = min_t(unsigned long, m, find_first_bit(&tmp, sizeof(tmp))); skip = 1 << m; mask = skip - 1; base = pfn;