From patchwork Wed Oct 12 14:54:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101703 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp481663qge; Wed, 12 Oct 2016 07:55:22 -0700 (PDT) X-Received: by 10.99.109.75 with SMTP id i72mr1946151pgc.151.1476284122740; Wed, 12 Oct 2016 07:55:22 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h190si6240316pgc.331.2016.10.12.07.55.22; Wed, 12 Oct 2016 07:55:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933546AbcJLOzH (ORCPT + 4 others); Wed, 12 Oct 2016 10:55:07 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:53683 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755396AbcJLOzF (ORCPT ); Wed, 12 Oct 2016 10:55:05 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MUo3w-1bMD0V2WXE-00Y9iE; Wed, 12 Oct 2016 16:54:39 +0200 From: Arnd Bergmann To: Wei Liu , Paul Durrant Cc: Arnd Bergmann , "David S. Miller" , David Vrabel , xen-devel@lists.xenproject.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] xen-netback: fix type mismatch warning Date: Wed, 12 Oct 2016 16:54:01 +0200 Message-Id: <20161012145434.2493788-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:66dq2BVsVyV/PcypvWTatmhpWjXji8BsZZz+fvrsccdmXG8du36 pnXz2Xvz6eHy6zy1h3++y09IYceYYBO9rcfwa5I7epHtBMA0SMsZrf3YFl4+gqdZZHCV1E+ e7WXmcLgebZhjNr4UrtopadNTObYDWwwo2UAtaNN4KYmw7hTmqefU3XoaaGpvBN1fHAZtyY xzrSuw+MwB/x62JKHdSnQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:HTh5GlKYmm8=:XncnvlHIK+AQY5mFl41/k5 53KLilZWFovUzEZ0rIAE5SI41NyaDTL577peBuITN35B6QGnECVq2LYqulGgAz5YHrfwkpf5S pG1oZbDMfVuONINy8Qrb2gt6pVvssVZYEZghSnnV+Y387gGVkyfTySZgYAAXDqVIjCqHMO7NU vbUXocEtskZJpWzeqQ6hSx2khC7Rw5yhBwj3hHFcaV2TI8p/vCHJ2yhEidhzL8+HPo2nJ+S8n 0236f0ZKIGWV68hrtl4bbOoofXzygicAkIWzF2lZGJmCYeB3RU26yfovQE2DP0Xg+zKd/KaBh LXzx79G6wnB7lQ/VhglHIhY/ArX8JLRwLeDnEJijo4WRe4YwGf8VjaxFMIMEGsaftPi+7XwX+ C9rUSF37xofD8yvsX9rz5Pz47Y9JO0Y7PsUC3YvQhu27P4ulGz+RWghVpLkgLjSYjqyKnQEZi 6dcppHsfVM+ga2OMAnLmZ7Ag818ocib7wK8RQIOIIYIW9zjAm7P9+aeO0XPWWoyOpMD+aKxLX //vzV2jrRf2KcOFUCpUNy3RSQbZ4w3NbgSiVsx2ZRI7gcsT1ah/pWzSXXkFPxbjTckWIhAdbV w0Kjwf7zUlnubgClorAadK/lqvrC4RIqlvLOWgH1P0H7fwlSp9+R/1U4Y0oUESuzsQuGIu/YH 9lDVfviESJOh7CPBJ4n+8eGWf/VDMKGuKw7BhQnUKtnxeyq2VW2GpvStfveofAfrt3OA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Wiht the latest rework of the xen-netback driver, we get a warning on ARM about the types passed into min(): drivers/net/xen-netback/rx.c: In function 'xenvif_rx_next_chunk': include/linux/kernel.h:739:16: error: comparison of distinct pointer types lacks a cast [-Werror] The reason is that XEN_PAGE_SIZE is not size_t here. There is no actual bug, and we can easily avoid the warning using the min_t() macro instead of min(). Fixes: eb1723a29b9a ("xen-netback: refactor guest rx") Signed-off-by: Arnd Bergmann --- drivers/net/xen-netback/rx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c index 8e9ade6ccf18..aeb150258c6c 100644 --- a/drivers/net/xen-netback/rx.c +++ b/drivers/net/xen-netback/rx.c @@ -337,9 +337,9 @@ static void xenvif_rx_next_chunk(struct xenvif_queue *queue, frag_data += pkt->frag_offset; frag_len -= pkt->frag_offset; - chunk_len = min(frag_len, XEN_PAGE_SIZE - offset); - chunk_len = min(chunk_len, - XEN_PAGE_SIZE - xen_offset_in_page(frag_data)); + chunk_len = min_t(size_t, frag_len, XEN_PAGE_SIZE - offset); + chunk_len = min_t(size_t, chunk_len, XEN_PAGE_SIZE - + xen_offset_in_page(frag_data)); pkt->frag_offset += chunk_len;