Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753479AbbDMIhW (ORCPT ); Mon, 13 Apr 2015 04:37:22 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:44502 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbbDMIhT (ORCPT ); Mon, 13 Apr 2015 04:37:19 -0400 Message-ID: <552B802A.3080709@oracle.com> Date: Mon, 13 Apr 2015 16:36:58 +0800 From: Bob Liu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Stephen Rothwell CC: Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Wei Liu , David Vrabel , Paul Durrant Subject: Re: linux-next: build failure after merge of the xen-tip tree References: <20150413180902.59d8e9bd@canb.auug.org.au> In-Reply-To: <20150413180902.59d8e9bd@canb.auug.org.au> Content-Type: multipart/mixed; boundary="------------030609070506060203060808" X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3465 Lines: 101 This is a multi-part message in MIME format. --------------030609070506060203060808 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi Stephen, On 04/13/2015 04:09 PM, Stephen Rothwell wrote: > Hi all, > > After merging the xen-tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/char/tpm/xen-tpmfront.c: In function 'setup_ring': > drivers/char/tpm/xen-tpmfront.c:203:7: warning: passing argument 2 of 'xenbus_grant_ring' makes pointer from integer without a cast > rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr)); > ^ > In file included from drivers/char/tpm/xen-tpmfront.c:17:0: > include/xen/xenbus.h:206:5: note: expected 'void *' but argument is of type 'long unsigned int' > int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr, > ^ > drivers/char/tpm/xen-tpmfront.c:203:7: error: too few arguments to function 'xenbus_grant_ring' > rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr)); > ^ > In file included from drivers/char/tpm/xen-tpmfront.c:17:0: > include/xen/xenbus.h:206:5: note: declared here > int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr, > ^ > > Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to > support multi-page ring"). > > I have used the xen-tip tree from next-20150410 for today. > Sorry for this issue, I missed the xentpm-front.c file in that patch. (Original patch from Wei Liu already included the right modification which didn't exist in Paul's.) Attached patch should fix this build failure. -- Regards, -Bob --------------030609070506060203060808 Content-Type: text/x-patch; name="0001-xen-tpmfront-fix-build-error.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-xen-tpmfront-fix-build-error.patch" >From 973eacee793595b9790957186ffd27f192f5dd4f Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Mon, 13 Apr 2015 16:29:10 +0800 Subject: [PATCH] xen-tpmfront: fix build failure Fix build failure caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to support multi-page ring"), xen-tpmfront was missed in that commit. Signed-off-by: Bob Liu --- drivers/char/tpm/xen-tpmfront.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index c3b4f5a..3111f27 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c @@ -193,6 +193,7 @@ static int setup_ring(struct xenbus_device *dev, struct tpm_private *priv) struct xenbus_transaction xbt; const char *message = NULL; int rv; + grant_ref_t gref; priv->shr = (void *)__get_free_page(GFP_KERNEL|__GFP_ZERO); if (!priv->shr) { @@ -200,11 +201,11 @@ static int setup_ring(struct xenbus_device *dev, struct tpm_private *priv) return -ENOMEM; } - rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr)); + rv = xenbus_grant_ring(dev, &priv->shr, 1, &gref); if (rv < 0) return rv; - priv->ring_ref = rv; + priv->ring_ref = gref; rv = xenbus_alloc_evtchn(dev, &priv->evtchn); if (rv) -- 1.7.10.4 --------------030609070506060203060808-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/