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