Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen terminology fixes from David Vrabel:
 "Use the correct GFN/BFN terms more consistently"

* tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn
  xen/privcmd: Further s/MFN/GFN/ clean-up
  hvc/xen: Further s/MFN/GFN clean-up
  video/xen-fbfront: Further s/MFN/GFN clean-up
  xen/tmem: Use xen_page_to_gfn rather than pfn_to_gfn
  xen: Use correctly the Xen memory terminologies
  arm/xen: implement correctly pfn_to_mfn
  xen: Make clear that swiotlb and biomerge are dealing with DMA address

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index abc1381264fc..ec98d43916a8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -325,7 +325,7 @@ static void xenvif_gop_frag_copy(struct xenvif_queue *queue, struct sk_buff *skb
                 } else {
                         copy_gop->source.domid = DOMID_SELF;
                         copy_gop->source.u.gmfn =
-                                virt_to_mfn(page_address(page));
+                                virt_to_gfn(page_address(page));
                 }
                 copy_gop->source.offset = offset;
 
@@ -1406,7 +1406,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
                 queue->tx_copy_ops[*copy_ops].source.offset = txreq.offset;
 
                 queue->tx_copy_ops[*copy_ops].dest.u.gmfn =
-                        virt_to_mfn(skb->data);
+                        virt_to_gfn(skb->data);
                 queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF;
                 queue->tx_copy_ops[*copy_ops].dest.offset =
                         offset_in_page(skb->data);