Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio/vhost updates from Michael Tsirkin:
 "New features, performance improvements, cleanups:

   - basic polling support for vhost
   - rework virtio to optionally use DMA API, fixing it on Xen
   - balloon stats gained a new entry
   - using the new napi_alloc_skb speeds up virtio net
   - virtio blk stats can now be read while another VCPU is busy
     inflating or deflating the balloon

  plus misc cleanups in various places"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()
  vhost_net: basic polling support
  vhost: introduce vhost_vq_avail_empty()
  vhost: introduce vhost_has_work()
  virtio_balloon: Allow to resize and update the balloon stats in parallel
  virtio_balloon: Use a workqueue instead of "vballoon" kthread
  virtio/s390: size of SET_IND payload
  virtio/s390: use dev_to_virtio
  vhost: rename vhost_init_used()
  vhost: rename cross-endian helpers
  virtio_blk: VIRTIO_BLK_F_WCE->VIRTIO_BLK_F_FLUSH
  vring: Use the DMA API on Xen
  virtio_pci: Use the DMA API if enabled
  virtio_mmio: Use the DMA API if enabled
  virtio: Add improved queue allocation API
  virtio_ring: Support DMA APIs
  vring: Introduce vring_use_dma_api()
  s390/dma: Allow per device dma ops
  alpha/dma: use common noop dma ops
  dma: Provide simple noop dma ops

1 files changed, 4 insertions, 42 deletions

diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index 2b1f4a1e9272..8e735b5e56bd 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -123,44 +123,6 @@ static void *alpha_noop_alloc_coherent(struct device *dev, size_t size,
         return ret;
 }
 
-static void alpha_noop_free_coherent(struct device *dev, size_t size,
-                                     void *cpu_addr, dma_addr_t dma_addr,
-                                     struct dma_attrs *attrs)
-{
-        free_pages((unsigned long)cpu_addr, get_order(size));
-}
-
-static dma_addr_t alpha_noop_map_page(struct device *dev, struct page *page,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction dir,
-                                      struct dma_attrs *attrs)
-{
-        return page_to_pa(page) + offset;
-}
-
-static int alpha_noop_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
-                             enum dma_data_direction dir, struct dma_attrs *attrs)
-{
-        int i;
-        struct scatterlist *sg;
-
-        for_each_sg(sgl, sg, nents, i) {
-                void *va;
-
-                BUG_ON(!sg_page(sg));
-                va = sg_virt(sg);
-                sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va);
-                sg_dma_len(sg) = sg->length;
-        }
-
-        return nents;
-}
-
-static int alpha_noop_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-
 static int alpha_noop_supported(struct device *dev, u64 mask)
 {
         return mask < 0x00ffffffUL ? 0 : 1;
@@ -168,10 +130,10 @@ static int alpha_noop_supported(struct device *dev, u64 mask)
 
 struct dma_map_ops alpha_noop_ops = {
         .alloc                  = alpha_noop_alloc_coherent,
-        .free                   = alpha_noop_free_coherent,
-        .map_page               = alpha_noop_map_page,
-        .map_sg                 = alpha_noop_map_sg,
-        .mapping_error          = alpha_noop_mapping_error,
+        .free                   = dma_noop_free_coherent,
+        .map_page               = dma_noop_map_page,
+        .map_sg                 = dma_noop_map_sg,
+        .mapping_error          = dma_noop_mapping_error,
         .dma_supported          = alpha_noop_supported,
 };