Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - a few misc things

 - kexec updates

 - DMA-mapping updates to better support networking DMA operations

 - IPC updates

 - various MM changes to improve DAX fault handling

 - lots of radix-tree changes, mainly to the test suite. All leading up
   to reimplementing the IDA/IDR code to be a wrapper layer over the
   radix-tree. However the final trigger-pulling patch is held off for
   4.11.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
  radix tree test suite: delete unused rcupdate.c
  radix tree test suite: add new tag check
  radix-tree: ensure counts are initialised
  radix tree test suite: cache recently freed objects
  radix tree test suite: add some more functionality
  idr: reduce the number of bits per level from 8 to 6
  rxrpc: abstract away knowledge of IDR internals
  tpm: use idr_find(), not idr_find_slowpath()
  idr: add ida_is_empty
  radix tree test suite: check multiorder iteration
  radix-tree: fix replacement for multiorder entries
  radix-tree: add radix_tree_split_preload()
  radix-tree: add radix_tree_split
  radix-tree: add radix_tree_join
  radix-tree: delete radix_tree_range_tag_if_tagged()
  radix-tree: delete radix_tree_locate_item()
  radix-tree: improve multiorder iterators
  btrfs: fix race in btrfs_free_dummy_fs_info()
  radix-tree: improve dump output
  radix-tree: make radix_tree_find_next_bit more useful
  ...

31 files changed, 115 insertions, 105 deletions

diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index 199b8e99f7d7..737187865269 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -19,8 +19,7 @@ static int alpha_core_agp_vm_fault(struct vm_area_struct *vma,
         unsigned long pa;
         struct page *page;
 
-        dma_addr = (unsigned long)vmf->virtual_address - vma->vm_start
-                                                + agp->aperture.bus_base;
+        dma_addr = vmf->address - vma->vm_start + agp->aperture.bus_base;
         pa = agp->ops->translate(agp, dma_addr);
 
         if (pa == (unsigned long)-EINVAL)
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index f3f92d5fcda0..a697ca0cab1e 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -227,7 +227,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
          * be because another thread has installed the pte first, so it
          * is no problem.
          */
-        vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        vm_insert_pfn(vma, vmf->address, pfn);
 
         return VM_FAULT_NOPAGE;
 }
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 7a4869151d3b..a77262d31911 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(tpm_put_ops);
  *
  * The return'd chip has been tpm_try_get_ops'd and must be released via
  * tpm_put_ops
-  */
+ */
 struct tpm_chip *tpm_chip_find_get(int chip_num)
 {
         struct tpm_chip *chip, *res = NULL;
@@ -103,7 +103,7 @@ struct tpm_chip *tpm_chip_find_get(int chip_num)
                         }
                 } while (chip_prev != chip_num);
         } else {
-                chip = idr_find_slowpath(&dev_nums_idr, chip_num);
+                chip = idr_find(&dev_nums_idr, chip_num);
                 if (chip && !tpm_try_get_ops(chip))
                         res = chip;
         }
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 286447a83dab..26ec39ddf21f 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -328,7 +328,6 @@ static phys_addr_t pgoff_to_phys(struct dax_dev *dax_dev, pgoff_t pgoff,
 static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma,
                 struct vm_fault *vmf)
 {
-        unsigned long vaddr = (unsigned long) vmf->virtual_address;
         struct device *dev = &dax_dev->dev;
         struct dax_region *dax_region;
         int rc = VM_FAULT_SIGBUS;
@@ -353,7 +352,7 @@ static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma,
 
         pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);
 
-        rc = vm_insert_mixed(vma, vaddr, pfn);
+        rc = vm_insert_mixed(vma, vmf->address, pfn);
 
         if (rc == -ENOMEM)
                 return VM_FAULT_OOM;
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 768087ddb046..a293c8be232c 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -17,12 +17,11 @@
 static int armada_gem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct armada_gem_object *obj = drm_to_armada_gem(vma->vm_private_data);
-        unsigned long addr = (unsigned long)vmf->virtual_address;
         unsigned long pfn = obj->phys_addr >> PAGE_SHIFT;
         int ret;
 
-        pfn += (addr - vma->vm_start) >> PAGE_SHIFT;
-        ret = vm_insert_pfn(vma, addr, pfn);
+        pfn += (vmf->address - vma->vm_start) >> PAGE_SHIFT;
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
 
         switch (ret) {
         case 0:
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index caa4e4ca616d..bd311c77c254 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -124,8 +124,7 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * Using vm_pgoff as a selector forces us to use this unusual
                  * addressing scheme.
                  */
-                resource_size_t offset = (unsigned long)vmf->virtual_address -
-                        vma->vm_start;
+                resource_size_t offset = vmf->address - vma->vm_start;
                 resource_size_t baddr = map->offset + offset;
                 struct drm_agp_mem *agpmem;
                 struct page *page;
@@ -195,7 +194,7 @@ static int drm_do_vm_shm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!map)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
+        offset = vmf->address - vma->vm_start;
         i = (unsigned long)map->handle + offset;
         page = vmalloc_to_page((void *)i);
         if (!page)
@@ -301,7 +300,8 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!dma->pagelist)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;   /* vm_[pg]off[set] should be 0 */
+        offset = vmf->address - vma->vm_start;
+                                        /* vm_[pg]off[set] should be 0 */
         page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
         page = virt_to_page((void *)dma->pagelist[page_nr]);
 
@@ -337,7 +337,7 @@ static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!entry->pagelist)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
+        offset = vmf->address - vma->vm_start;
         map_offset = map->offset - (unsigned long)dev->sg->virtual;
         page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
         page = entry->pagelist[page_offset];
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 7d066a91d778..114dddbd297b 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -202,15 +202,14 @@ int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         page = pages[pgoff];
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
              page_to_pfn(page), page_to_pfn(page) << PAGE_SHIFT);
 
-        ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        ret = vm_insert_page(vma, vmf->address, page);
 
 out:
         switch (ret) {
@@ -759,7 +758,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages(
         down_read(&mm->mmap_sem);
         while (pinned < npages) {
                 ret = get_user_pages_remote(task, mm, ptr, npages - pinned,
-                                            flags, pvec + pinned, NULL);
+                                            flags, pvec + pinned, NULL, NULL);
                 if (ret < 0)
                         break;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index ea7a18230888..57b81460fec8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -455,8 +455,7 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         pgoff_t page_offset;
         int ret;
 
-        page_offset = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (page_offset >= (exynos_gem->size >> PAGE_SHIFT)) {
                 DRM_ERROR("invalid page offset\n");
@@ -465,8 +464,7 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         pfn = page_to_pfn(exynos_gem->pages[page_offset]);
-        ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 
 out:
         switch (ret) {
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 4071b2d1e8cf..8b44fa542562 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -125,7 +125,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                                   psbfb->gtt->offset;
 
         page_num = vma_pages(vma);
-        address = (unsigned long)vmf->virtual_address - (vmf->pgoff << PAGE_SHIFT);
+        address = vmf->address - (vmf->pgoff << PAGE_SHIFT);
 
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 6d1cb6b370b1..527c62917660 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -197,15 +197,14 @@ int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         /* Page relative to the VMA start - we must calculate this ourselves
            because vmf->pgoff is the fake GEM offset */
-        page_offset = ((unsigned long) vmf->virtual_address - vma->vm_start)
-                                >> PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         /* CPU view of the page, don't go via the GART for CPU writes */
         if (r->stolen)
                 pfn = (dev_priv->stolen_base + r->offset) >> PAGE_SHIFT;
         else
                 pfn = page_to_pfn(r->pages[page_offset]);
-        ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
 
 fail:
         mutex_unlock(&dev_priv->mmap_mutex);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d0dcaf35b429..412f3513f269 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1796,8 +1796,7 @@ int i915_gem_fault(struct vm_area_struct *area, struct vm_fault *vmf)
         int ret;
 
         /* We don't use vmf->pgoff since that has the fake offset */
-        page_offset = ((unsigned long)vmf->virtual_address - area->vm_start) >>
-                PAGE_SHIFT;
+        page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT;
 
         trace_i915_gem_object_fault(obj, page_offset, true, write);
 
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 107ddf51065e..d068af2ec3a3 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -515,7 +515,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
                                          obj->userptr.ptr + pinned * PAGE_SIZE,
                                          npages - pinned,
                                          flags,
-                                         pvec + pinned, NULL);
+                                         pvec + pinned, NULL, NULL);
                                 if (ret < 0)
                                         break;
 
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index cd06cfd94687..d8bc59c7e261 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -225,16 +225,14 @@ int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         pfn = page_to_pfn(pages[pgoff]);
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
-        ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 
 out_unlock:
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index d4e1e11466f8..4a90c690f09e 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -398,8 +398,7 @@ static int fault_1d(struct drm_gem_object *obj,
         pgoff_t pgoff;
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (omap_obj->pages) {
                 omap_gem_cpu_sync(obj, pgoff);
@@ -409,11 +408,10 @@ static int fault_1d(struct drm_gem_object *obj,
                 pfn = (omap_obj->paddr >> PAGE_SHIFT) + pgoff;
         }
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
-        return vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        return vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 }
 
 /* Special handling for the case of faulting in 2d tiled buffers */
@@ -427,7 +425,7 @@ static int fault_2d(struct drm_gem_object *obj,
         struct page *pages[64];  /* XXX is this too much to have on stack? */
         unsigned long pfn;
         pgoff_t pgoff, base_pgoff;
-        void __user *vaddr;
+        unsigned long vaddr;
         int i, ret, slots;
 
         /*
@@ -447,8 +445,7 @@ static int fault_2d(struct drm_gem_object *obj,
         const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE);
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         /*
          * Actual address we start mapping at is rounded down to previous slot
@@ -459,7 +456,7 @@ static int fault_2d(struct drm_gem_object *obj,
         /* figure out buffer width in slots */
         slots = omap_obj->width >> priv->usergart[fmt].slot_shift;
 
-        vaddr = vmf->virtual_address - ((pgoff - base_pgoff) << PAGE_SHIFT);
+        vaddr = vmf->address - ((pgoff - base_pgoff) << PAGE_SHIFT);
 
         entry = &priv->usergart[fmt].entry[priv->usergart[fmt].last];
 
@@ -503,12 +500,11 @@ static int fault_2d(struct drm_gem_object *obj,
 
         pfn = entry->paddr >> PAGE_SHIFT;
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
         for (i = n; i > 0; i--) {
-                vm_insert_mixed(vma, (unsigned long)vaddr,
-                                __pfn_to_pfn_t(pfn, PFN_DEV));
+                vm_insert_mixed(vma, vaddr, __pfn_to_pfn_t(pfn, PFN_DEV));
                 pfn += priv->usergart[fmt].stride_pfn;
                 vaddr += PAGE_SIZE * m;
         }
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index c08e5279eeac..7d853e6b5ff0 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -452,10 +452,10 @@ static int tegra_bo_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!bo->pages)
                 return VM_FAULT_SIGBUS;
 
-        offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >> PAGE_SHIFT;
+        offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
         page = bo->pages[offset];
 
-        err = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        err = vm_insert_page(vma, vmf->address, page);
         switch (err) {
         case -EAGAIN:
         case 0:
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 4748aedc933a..68ef993ab431 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -101,7 +101,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct page *page;
         int ret;
         int i;
-        unsigned long address = (unsigned long)vmf->virtual_address;
+        unsigned long address = vmf->address;
         int retval = VM_FAULT_NOPAGE;
         struct ttm_mem_type_manager *man =
                 &bdev->man[bo->mem.mem_type];
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 818e70712b18..3c0c4bd3f750 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -107,14 +107,13 @@ int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned int page_offset;
         int ret = 0;
 
-        page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >>
-                PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (!obj->pages)
                 return VM_FAULT_SIGBUS;
 
         page = obj->pages[page_offset];
-        ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        ret = vm_insert_page(vma, vmf->address, page);
         switch (ret) {
         case -EAGAIN:
         case 0:
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index f36c14729b55..477e07f0ecb6 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -54,7 +54,7 @@ static int vgem_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_vgem_gem_object *obj = vma->vm_private_data;
         /* We don't use vmf->pgoff since that has the fake offset */
-        unsigned long vaddr = (unsigned long)vmf->virtual_address;
+        unsigned long vaddr = vmf->address;
         struct page *page;
 
         page = shmem_read_mapping_page(file_inode(obj->base.filp)->i_mapping,
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index 1f0fe3217f23..6b079a31dced 100644
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -578,7 +578,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem *umem, u64 user_virt, u64 bcnt,
                  */
                 npages = get_user_pages_remote(owning_process, owning_mm,
                                 user_virt, gup_num_pages,
-                                flags, local_page_list, NULL);
+                                flags, local_page_list, NULL, NULL);
                 up_read(&owning_mm->mmap_sem);
 
                 if (npages < 0)
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index 1db0af6c7f94..ba63ca57ed7e 100644
--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
@@ -439,13 +439,12 @@ static int videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct page *page;
 
         dprintk(3, "fault: fault @ %08lx [vma %08lx-%08lx]\n",
-                (unsigned long)vmf->virtual_address,
-                vma->vm_start, vma->vm_end);
+                vmf->address, vma->vm_start, vma->vm_end);
 
         page = alloc_page(GFP_USER | __GFP_DMA32);
         if (!page)
                 return VM_FAULT_OOM;
-        clear_user_highpage(page, (unsigned long)vmf->virtual_address);
+        clear_user_highpage(page, vmf->address);
         vmf->page = page;
 
         return 0;
diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index 5e506c19108a..5d36dcc7f47e 100644
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -117,13 +117,12 @@ int cxl_context_init(struct cxl_context *ctx, struct cxl_afu *afu, bool master,
 static int cxl_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct cxl_context *ctx = vma->vm_file->private_data;
-        unsigned long address = (unsigned long)vmf->virtual_address;
         u64 area, offset;
 
         offset = vmf->pgoff << PAGE_SHIFT;
 
         pr_devel("%s: pe: %i address: 0x%lx offset: 0x%llx\n",
-                        __func__, ctx->pe, address, offset);
+                        __func__, ctx->pe, vmf->address, offset);
 
         if (ctx->afu->current_mode == CXL_MODE_DEDICATED) {
                 area = ctx->afu->psn_phys;
@@ -155,7 +154,7 @@ static int cxl_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 return VM_FAULT_SIGBUS;
         }
 
-        vm_insert_pfn(vma, address, (area + offset) >> PAGE_SHIFT);
+        vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT);
 
         mutex_unlock(&ctx->status_mutex);
 
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 33741ad4a74a..af2e077da4b8 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -932,7 +932,7 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned long paddr, vaddr;
         unsigned long expires;
 
-        vaddr = (unsigned long)vmf->virtual_address;
+        vaddr = vmf->address;
         gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
                 vma, vaddr, GSEG_BASE(vaddr));
         STAT(nopfn);
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index d11093dce1b9..acbc3abe2ddd 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -210,7 +210,12 @@ struct igb_tx_buffer {
 struct igb_rx_buffer {
         dma_addr_t dma;
         struct page *page;
-        unsigned int page_offset;
+#if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536)
+        __u32 page_offset;
+#else
+        __u16 page_offset;
+#endif
+        __u16 pagecnt_bias;
 };
 
 struct igb_tx_queue_stats {
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index cae24a8ccf47..a761001308dc 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3947,11 +3947,23 @@ static void igb_clean_rx_ring(struct igb_ring *rx_ring)
                 if (!buffer_info->page)
                         continue;
 
-                dma_unmap_page(rx_ring->dev,
-                               buffer_info->dma,
-                               PAGE_SIZE,
-                               DMA_FROM_DEVICE);
-                __free_page(buffer_info->page);
+                /* Invalidate cache lines that may have been written to by
+                 * device so that we avoid corrupting memory.
+                 */
+                dma_sync_single_range_for_cpu(rx_ring->dev,
+                                              buffer_info->dma,
+                                              buffer_info->page_offset,
+                                              IGB_RX_BUFSZ,
+                                              DMA_FROM_DEVICE);
+
+                /* free resources associated with mapping */
+                dma_unmap_page_attrs(rx_ring->dev,
+                                     buffer_info->dma,
+                                     PAGE_SIZE,
+                                     DMA_FROM_DEVICE,
+                                     DMA_ATTR_SKIP_CPU_SYNC);
+                __page_frag_drain(buffer_info->page, 0,
+                                  buffer_info->pagecnt_bias);
 
                 buffer_info->page = NULL;
         }
@@ -6812,12 +6824,6 @@ static void igb_reuse_rx_page(struct igb_ring *rx_ring,
 
         /* transfer page from old buffer to new buffer */
         *new_buff = *old_buff;
-
-        /* sync the buffer for use by the device */
-        dma_sync_single_range_for_device(rx_ring->dev, old_buff->dma,
-                                         old_buff->page_offset,
-                                         IGB_RX_BUFSZ,
-                                         DMA_FROM_DEVICE);
 }
 
 static inline bool igb_page_is_reserved(struct page *page)
@@ -6829,13 +6835,15 @@ static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
                                   struct page *page,
                                   unsigned int truesize)
 {
+        unsigned int pagecnt_bias = rx_buffer->pagecnt_bias--;
+
         /* avoid re-using remote pages */
         if (unlikely(igb_page_is_reserved(page)))
                 return false;
 
 #if (PAGE_SIZE < 8192)
         /* if we are only owner of page we can reuse it */
-        if (unlikely(page_count(page) != 1))
+        if (unlikely(page_ref_count(page) != pagecnt_bias))
                 return false;
 
         /* flip page offset to other buffer */
@@ -6848,10 +6856,14 @@ static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
                 return false;
 #endif
 
-        /* Even if we own the page, we are not allowed to use atomic_set()
-         * This would break get_page_unless_zero() users.
+        /* If we have drained the page fragment pool we need to update
+         * the pagecnt_bias and page count so that we fully restock the
+         * number of references the driver holds.
          */
-        page_ref_inc(page);
+        if (unlikely(pagecnt_bias == 1)) {
+                page_ref_add(page, USHRT_MAX);
+                rx_buffer->pagecnt_bias = USHRT_MAX;
+        }
 
         return true;
 }
@@ -6903,7 +6915,6 @@ static bool igb_add_rx_frag(struct igb_ring *rx_ring,
                         return true;
 
                 /* this page cannot be reused so discard it */
-                __free_page(page);
                 return false;
         }
 
@@ -6938,6 +6949,13 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring,
         page = rx_buffer->page;
         prefetchw(page);
 
+        /* we are reusing so sync this buffer for CPU use */
+        dma_sync_single_range_for_cpu(rx_ring->dev,
+                                      rx_buffer->dma,
+                                      rx_buffer->page_offset,
+                                      size,
+                                      DMA_FROM_DEVICE);
+
         if (likely(!skb)) {
                 void *page_addr = page_address(page) +
                                   rx_buffer->page_offset;
@@ -6962,21 +6980,18 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring,
                 prefetchw(skb->data);
         }
 
-        /* we are reusing so sync this buffer for CPU use */
-        dma_sync_single_range_for_cpu(rx_ring->dev,
-                                      rx_buffer->dma,
-                                      rx_buffer->page_offset,
-                                      size,
-                                      DMA_FROM_DEVICE);
-
         /* pull page into skb */
         if (igb_add_rx_frag(rx_ring, rx_buffer, size, rx_desc, skb)) {
                 /* hand second half of page back to the ring */
                 igb_reuse_rx_page(rx_ring, rx_buffer);
         } else {
-                /* we are not reusing the buffer so unmap it */
-                dma_unmap_page(rx_ring->dev, rx_buffer->dma,
-                               PAGE_SIZE, DMA_FROM_DEVICE);
+                /* We are not reusing the buffer so unmap it and free
+                 * any references we are holding to it
+                 */
+                dma_unmap_page_attrs(rx_ring->dev, rx_buffer->dma,
+                                     PAGE_SIZE, DMA_FROM_DEVICE,
+                                     DMA_ATTR_SKIP_CPU_SYNC);
+                __page_frag_drain(page, 0, rx_buffer->pagecnt_bias);
         }
 
         /* clear contents of rx_buffer */
@@ -7234,7 +7249,8 @@ static bool igb_alloc_mapped_page(struct igb_ring *rx_ring,
         }
 
         /* map page for use */
-        dma = dma_map_page(rx_ring->dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);
+        dma = dma_map_page_attrs(rx_ring->dev, page, 0, PAGE_SIZE,
+                                 DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
 
         /* if mapping failed free memory back to system since
          * there isn't much point in holding memory we can't use
@@ -7249,6 +7265,7 @@ static bool igb_alloc_mapped_page(struct igb_ring *rx_ring,
         bi->dma = dma;
         bi->page = page;
         bi->page_offset = 0;
+        bi->pagecnt_bias = 1;
 
         return true;
 }
@@ -7275,6 +7292,12 @@ void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
                 if (!igb_alloc_mapped_page(rx_ring, bi))
                         break;
 
+                /* sync the buffer for use by the device */
+                dma_sync_single_range_for_device(rx_ring->dev, bi->dma,
+                                                 bi->page_offset,
+                                                 IGB_RX_BUFSZ,
+                                                 DMA_FROM_DEVICE);
+
                 /* Refresh the desc even if buffer_addrs didn't change
                  * because each write-back erases this info.
                  */
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
index e9cef9de9ed8..c96f9b1d948a 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
@@ -900,8 +900,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv,
 
                 /* bound gain by 2 bits value max, 3rd bit is sign */
                 data->delta_gain_code[i] =
-                        min(abs(delta_g),
-                        (s32) CHAIN_NOISE_MAX_DELTA_GAIN_CODE);
+                        min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE);
 
                 if (delta_g < 0)
                         /*
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index d5cc3070e83f..b653451843c8 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -882,7 +882,7 @@ static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         BUG_ON(!buffer->pages || !buffer->pages[vmf->pgoff]);
 
         pfn = page_to_pfn(ion_buffer_page(buffer->pages[vmf->pgoff]));
-        ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
         mutex_unlock(&buffer->lock);
         if (ret)
                 return VM_FAULT_ERROR;
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index 0b6d388d8aa4..697cbfbe9374 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -1014,7 +1014,7 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
                        "page %p map %p index %lu flags %lx count %u priv %0lx: got addr %p type NOPAGE\n",
                        vmf->page, vmf->page->mapping, vmf->page->index,
                        (long)vmf->page->flags, page_count(vmf->page),
-                       page_private(vmf->page), vmf->virtual_address);
+                       page_private(vmf->page), (void *)vmf->address);
                 if (unlikely(!(cfio->ft_flags & VM_FAULT_LOCKED))) {
                         lock_page(vmf->page);
                         cfio->ft_flags |= VM_FAULT_LOCKED;
@@ -1025,12 +1025,12 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
         }
 
         if (cfio->ft_flags & (VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV)) {
-                CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", vmf->virtual_address);
+                CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", (void *)vmf->address);
                 return -EFAULT;
         }
 
         if (cfio->ft_flags & VM_FAULT_OOM) {
-                CDEBUG(D_PAGE, "got addr %p - OOM\n", vmf->virtual_address);
+                CDEBUG(D_PAGE, "got addr %p - OOM\n", (void *)vmf->address);
                 return -ENOMEM;
         }
 
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 7abd70b2a588..3151d2a0fe59 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -905,7 +905,7 @@ static void hidg_free_inst(struct usb_function_instance *f)
         mutex_lock(&hidg_ida_lock);
 
         hidg_put_minor(opts->minor);
-        if (idr_is_empty(&hidg_ida.idr))
+        if (ida_is_empty(&hidg_ida))
                 ghid_cleanup();
 
         mutex_unlock(&hidg_ida_lock);
@@ -931,7 +931,7 @@ static struct usb_function_instance *hidg_alloc_inst(void)
 
         mutex_lock(&hidg_ida_lock);
 
-        if (idr_is_empty(&hidg_ida.idr)) {
+        if (ida_is_empty(&hidg_ida)) {
                 status = ghid_setup(NULL, HIDG_MINORS);
                 if (status)  {
                         ret = ERR_PTR(status);
@@ -944,7 +944,7 @@ static struct usb_function_instance *hidg_alloc_inst(void)
         if (opts->minor < 0) {
                 ret = ERR_PTR(opts->minor);
                 kfree(opts);
-                if (idr_is_empty(&hidg_ida.idr))
+                if (ida_is_empty(&hidg_ida))
                         ghid_cleanup();
                 goto unlock;
         }
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index 0de36cda6e41..8054da9276dd 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1265,7 +1265,7 @@ static void gprinter_free_inst(struct usb_function_instance *f)
         mutex_lock(&printer_ida_lock);
 
         gprinter_put_minor(opts->minor);
-        if (idr_is_empty(&printer_ida.idr))
+        if (ida_is_empty(&printer_ida))
                 gprinter_cleanup();
 
         mutex_unlock(&printer_ida_lock);
@@ -1289,7 +1289,7 @@ static struct usb_function_instance *gprinter_alloc_inst(void)
 
         mutex_lock(&printer_ida_lock);
 
-        if (idr_is_empty(&printer_ida.idr)) {
+        if (ida_is_empty(&printer_ida)) {
                 status = gprinter_setup(PRINTER_MINORS);
                 if (status) {
                         ret = ERR_PTR(status);
@@ -1302,7 +1302,7 @@ static struct usb_function_instance *gprinter_alloc_inst(void)
         if (opts->minor < 0) {
                 ret = ERR_PTR(opts->minor);
                 kfree(opts);
-                if (idr_is_empty(&printer_ida.idr))
+                if (ida_is_empty(&printer_ida))
                         gprinter_cleanup();
                 goto unlock;
         }
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 9815e45c23c4..f3726ba12aa6 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -362,7 +362,7 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
 
                 down_read(&mm->mmap_sem);
                 ret = get_user_pages_remote(NULL, mm, vaddr, 1, flags, page,
-                                            NULL);
+                                            NULL, NULL);
                 up_read(&mm->mmap_sem);
         }
 
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 702040fe2001..6e3306f4a525 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -602,7 +602,7 @@ static int privcmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         printk(KERN_DEBUG "privcmd_fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
                vma, vma->vm_start, vma->vm_end,
-               vmf->pgoff, vmf->virtual_address);
+               vmf->pgoff, (void *)vmf->address);
 
         return VM_FAULT_SIGBUS;
 }