Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755735AbbGPPiD (ORCPT ); Thu, 16 Jul 2015 11:38:03 -0400 Received: from smtp.citrix.com ([66.165.176.89]:23632 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbbGPPiB (ORCPT ); Thu, 16 Jul 2015 11:38:01 -0400 X-IronPort-AV: E=Sophos;i="5.15,488,1432598400"; d="scan'208";a="281646552" Date: Thu, 16 Jul 2015 16:36:53 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Julien Grall CC: , , , , , Greg Kroah-Hartman , Jiri Slaby , David Vrabel , Boris Ostrovsky , Subject: Re: [PATCH v2 11/20] tty/hvc: xen: Use xen page definition In-Reply-To: <1436474552-31789-12-git-send-email-julien.grall@citrix.com> Message-ID: References: <1436474552-31789-1-git-send-email-julien.grall@citrix.com> <1436474552-31789-12-git-send-email-julien.grall@citrix.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1999 Lines: 55 On Thu, 9 Jul 2015, Julien Grall wrote: > The console ring is always based on the page granularity of Xen. > > Signed-off-by: Julien Grall > Cc: Greg Kroah-Hartman > Cc: Jiri Slaby > Cc: David Vrabel > Cc: Stefano Stabellini > Cc: Boris Ostrovsky > Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Stefano Stabellini > drivers/tty/hvc/hvc_xen.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c > index a9d837f..2135944 100644 > --- a/drivers/tty/hvc/hvc_xen.c > +++ b/drivers/tty/hvc/hvc_xen.c > @@ -230,7 +230,7 @@ static int xen_hvm_console_init(void) > if (r < 0 || v == 0) > goto err; > mfn = v; > - info->intf = xen_remap(mfn << PAGE_SHIFT, PAGE_SIZE); > + info->intf = xen_remap(mfn << XEN_PAGE_SHIFT, XEN_PAGE_SIZE); > if (info->intf == NULL) > goto err; > info->vtermno = HVC_COOKIE; > @@ -392,7 +392,7 @@ static int xencons_connect_backend(struct xenbus_device *dev, > if (xen_pv_domain()) > mfn = virt_to_mfn(info->intf); > else > - mfn = __pa(info->intf) >> PAGE_SHIFT; > + mfn = __pa(info->intf) >> XEN_PAGE_SHIFT; > ret = gnttab_alloc_grant_references(1, &gref_head); > if (ret < 0) > return ret; > @@ -476,7 +476,7 @@ static int xencons_resume(struct xenbus_device *dev) > struct xencons_info *info = dev_get_drvdata(&dev->dev); > > xencons_disconnect_backend(info); > - memset(info->intf, 0, PAGE_SIZE); > + memset(info->intf, 0, XEN_PAGE_SIZE); > return xencons_connect_backend(dev, info); > } > > -- > 2.1.4 > -- 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/