---

yaml --- r: 93183 b: refs/heads/master c: 2bd5003 h: refs/heads/master i: 93181: 3d15fd7 93179: e4bc15c 93175: 3321482 93167: e6e4902 93151: 2d7bb73 93119: dec4387 93055: 5b1daf4 92927: 10ba2ba 92671: 9942408 92159: 1c9e807 v: v3
git-mirror · Apr 24, 2008 · d5d762b · d5d762b
1 parent 061512f
commit d5d762b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e332b2a2dfe514cd441ed0ce1096ed1863e378
+refs/heads/master: 2bd50036b5dfc929390ddc48be7f6314447b2be3
diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c
@@ -156,19 +156,27 @@ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)
 void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
 		    pte_t *ptep, pte_t pteval)
 {
+	/* updates to init_mm may be done without lock */
+	if (mm == &init_mm)
+		preempt_disable();
+
 	if (mm == current->mm || mm == &init_mm) {
 		if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {
 			struct multicall_space mcs;
 			mcs = xen_mc_entry(0);
 
 			MULTI_update_va_mapping(mcs.mc, addr, pteval, 0);
 			xen_mc_issue(PARAVIRT_LAZY_MMU);
-			return;
+			goto out;
 		} else
 			if (HYPERVISOR_update_va_mapping(addr, pteval, 0) == 0)
-				return;
+				goto out;
 	}
 	xen_set_pte(ptep, pteval);
+
+out:
+	if (mm == &init_mm)
+		preempt_enable();
 }
 
 pteval_t xen_pte_val(pte_t pte)