From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933696AbcJMBWZ convert rfc822-to-8bit (ORCPT ); Wed, 12 Oct 2016 21:22:25 -0400 Received: from smtp.ctxuk.citrix.com ([185.25.65.24]:19958 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933222AbcJMBWQ (ORCPT ); Wed, 12 Oct 2016 21:22:16 -0400 X-IronPort-AV: E=Sophos;i="5.31,338,1473120000"; d="scan'208";a="32958207" From: Paul Durrant To: Arnd Bergmann , Wei Liu CC: "David S. Miller" , David Vrabel , "xen-devel@lists.xenproject.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH] xen-netback: fix type mismatch warning Thread-Topic: [PATCH] xen-netback: fix type mismatch warning Thread-Index: AQHSJJigW3mXTDAE40a597Fivme1dKCllw4w Date: Thu, 13 Oct 2016 01:22:12 +0000 Message-ID: References: <20161012145434.2493788-1-arnd@arndb.de> In-Reply-To: <20161012145434.2493788-1-arnd@arndb.de> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-DLP: AMS1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Arnd Bergmann [mailto:arnd@arndb.de] > Sent: 12 October 2016 10:54 > 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 > > 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 LGTM Acked-by: Paul Durrant > --- > drivers/net/xen-netback/rx.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > 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; > > -- > 2.9.0