[PATCH v2 11/20] tty/hvc: xen: Use xen page definition
From: Stefano Stabellini <hidden>
Date: 2015-07-16 15:38:03
Also in:
linuxppc-dev, lkml
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 <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <redacted> Cc: David Vrabel <redacted> Cc: Stefano Stabellini <redacted> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: linuxppc-dev at lists.ozlabs.org
Reviewed-by: Stefano Stabellini <redacted>
quoted hunk ↗ jump to hunk
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