Merge tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen features and fixes from David Vrabel:

 - use a single source list of hypercalls, generating other tables etc.
   at build time.

 - add a "Xen PV" APIC driver to support >255 VCPUs in PV guests.

 - significant performance improve to guest save/restore/migration.

 - scsiback/front save/restore support.

 - infrastructure for multi-page xenbus rings.

 - misc fixes.

* tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pci: Try harder to get PXM information for Xen
  xenbus_client: Extend interface to support multi-page ring
  xen-pciback: also support disabling of bus-mastering and memory-write-invalidate
  xen: support suspend/resume in pvscsi frontend
  xen: scsiback: add LUN of restored domain
  xen-scsiback: define a pr_fmt macro with xen-pvscsi
  xen/mce: fix up xen_late_init_mcelog() error handling
  xen/privcmd: improve performance of MMAPBATCH_V2
  xen: unify foreign GFN map/unmap for auto-xlated physmap guests
  x86/xen/apic: WARN with details.
  x86/xen: Provide a "Xen PV" APIC driver to support >255 VCPUs
  xen/pciback: Don't print scary messages when unsupported by hypervisor.
  xen: use generated hypercall symbols in arch/x86/xen/xen-head.S
  xen: use generated hypervisor symbols in arch/x86/xen/trace.c
  xen: synchronize include/xen/interface/xen.h with xen
  xen: build infrastructure for generating hypercall depending symbols
  xen: balloon: Use static attribute groups for sysfs entries
  xen: pcpu: Use static attribute groups for sysfs entry

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 720aaf6313d2..4c08f98f4484 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1483,6 +1483,7 @@ static int setup_netfront(struct xenbus_device *dev,
 {
         struct xen_netif_tx_sring *txs;
         struct xen_netif_rx_sring *rxs;
+        grant_ref_t gref;
         int err;
 
         queue->tx_ring_ref = GRANT_INVALID_REF;
@@ -1499,10 +1500,10 @@ static int setup_netfront(struct xenbus_device *dev,
         SHARED_RING_INIT(txs);
         FRONT_RING_INIT(&queue->tx, txs, PAGE_SIZE);
 
-        err = xenbus_grant_ring(dev, virt_to_mfn(txs));
+        err = xenbus_grant_ring(dev, txs, 1, &gref);
         if (err < 0)
                 goto grant_tx_ring_fail;
-        queue->tx_ring_ref = err;
+        queue->tx_ring_ref = gref;
 
         rxs = (struct xen_netif_rx_sring *)get_zeroed_page(GFP_NOIO | __GFP_HIGH);
         if (!rxs) {
@@ -1513,10 +1514,10 @@ static int setup_netfront(struct xenbus_device *dev,
         SHARED_RING_INIT(rxs);
         FRONT_RING_INIT(&queue->rx, rxs, PAGE_SIZE);
 
-        err = xenbus_grant_ring(dev, virt_to_mfn(rxs));
+        err = xenbus_grant_ring(dev, rxs, 1, &gref);
         if (err < 0)
                 goto grant_rx_ring_fail;
-        queue->rx_ring_ref = err;
+        queue->rx_ring_ref = gref;
 
         if (feature_split_evtchn)
                 err = setup_netfront_split(queue);