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
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index efeceb0a222d..3815e940fbea 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -76,16 +76,20 @@ static void async_pf_execute(struct work_struct *work)
         struct kvm_vcpu *vcpu = apf->vcpu;
         unsigned long addr = apf->addr;
         gva_t gva = apf->gva;
+        int locked = 1;
 
         might_sleep();
 
         /*
          * This work is run asynchromously to the task which owns
          * mm and might be done in another context, so we must
-         * use FOLL_REMOTE.
+         * access remotely.
          */
-        __get_user_pages_unlocked(NULL, mm, addr, 1, NULL,
-                        FOLL_WRITE | FOLL_REMOTE);
+        down_read(&mm->mmap_sem);
+        get_user_pages_remote(NULL, mm, addr, 1, FOLL_WRITE, NULL, NULL,
+                        &locked);
+        if (locked)
+                up_read(&mm->mmap_sem);
 
         kvm_async_page_present_sync(vcpu, apf);