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, 7 insertions, 5 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index b9c637a0036b..f821a97d7827 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -291,7 +291,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
                 struct sk_buff *skb;
                 unsigned short id;
                 grant_ref_t ref;
-                unsigned long pfn;
+                unsigned long gfn;
                 struct xen_netif_rx_request *req;
 
                 skb = xennet_alloc_one_rx_buffer(queue);
@@ -307,12 +307,12 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
                 BUG_ON((signed short)ref < 0);
                 queue->grant_rx_ref[id] = ref;
 
-                pfn = page_to_pfn(skb_frag_page(&skb_shinfo(skb)->frags[0]));
+                gfn = xen_page_to_gfn(skb_frag_page(&skb_shinfo(skb)->frags[0]));
 
                 req = RING_GET_REQUEST(&queue->rx, req_prod);
                 gnttab_grant_foreign_access_ref(ref,
                                                 queue->info->xbdev->otherend_id,
-                                                pfn_to_mfn(pfn),
+                                                gfn,
                                                 0);
 
                 req->id = id;
@@ -430,8 +430,10 @@ static struct xen_netif_tx_request *xennet_make_one_txreq(
         ref = gnttab_claim_grant_reference(&queue->gref_tx_head);
         BUG_ON((signed short)ref < 0);
 
-        gnttab_grant_foreign_access_ref(ref, queue->info->xbdev->otherend_id,
-                                        page_to_mfn(page), GNTMAP_readonly);
+        gnttab_grant_foreign_access_ref(ref,
+                                        queue->info->xbdev->otherend_id,
+                                        xen_page_to_gfn(page),
+                                        GNTMAP_readonly);
 
         queue->tx_skbs[id].skb = skb;
         queue->grant_tx_page[id] = page;