aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/xen-fbfront.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index 09dc44736c1a..25e3cce0c35f 100644
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -539,7 +539,7 @@ static int xenfb_remove(struct xenbus_device *dev)
539 539
540static unsigned long vmalloc_to_mfn(void *address) 540static unsigned long vmalloc_to_mfn(void *address)
541{ 541{
542 return pfn_to_mfn(vmalloc_to_pfn(address)); 542 return pfn_to_gfn(vmalloc_to_pfn(address));
543} 543}
544 544
545static void xenfb_init_shared_page(struct xenfb_info *info, 545static void xenfb_init_shared_page(struct xenfb_info *info,
@@ -586,7 +586,7 @@ static int xenfb_connect_backend(struct xenbus_device *dev,
586 goto unbind_irq; 586 goto unbind_irq;
587 } 587 }
588 ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", 588 ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu",
589 virt_to_mfn(info->page)); 589 virt_to_gfn(info->page));
590 if (ret) 590 if (ret)
591 goto error_xenbus; 591 goto error_xenbus;
592 ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", 592 ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u",