---

yaml --- r: 202367 b: refs/heads/master c: bbeb340 h: refs/heads/master i: 202365: 2894a0e 202363: 3a66414 202359: a43e1e4 202351: 6d58b3a 202335: b3703c6 202303: 8dc147c 202239: 87e0a68 v: v3
git-mirror · Aug 1, 2010 · bb55bde · bb55bde
1 parent df3128d
commit bb55bde
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c3f6041172b78d5532c6bf3680d304e92ec2e66
+refs/heads/master: bbeb34062fbad287c949a945a516a0c15b179993
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
@@ -1298,6 +1298,9 @@ int soft_offline_page(struct page *page, int flags)
 	return ret;
 }
 
+/*
+ * The caller must hold current->mm->mmap_sem in read mode.
+ */
 int is_hwpoison_address(unsigned long addr)
 {
 	pgd_t *pgdp;

diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
@@ -947,12 +947,13 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr)
 	if (unlikely(npages != 1)) {
 		struct vm_area_struct *vma;
 
+		down_read(&current->mm->mmap_sem);
 		if (is_hwpoison_address(addr)) {
+			up_read(&current->mm->mmap_sem);
 			get_page(hwpoison_page);
 			return page_to_pfn(hwpoison_page);
 		}
 
-		down_read(&current->mm->mmap_sem);
 		vma = find_vma(current->mm, addr);
 
 		if (vma == NULL || addr < vma->vm_start ||