---

yaml --- r: 234169 b: refs/heads/master c: c761779 h: refs/heads/master i: 234167: b3fbf19 v: v3
git-mirror · Mar 14, 2011 · ed0295e · ed0295e
1 parent 3ed2224
commit ed0295e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb38923ead10aa8a28db191548e176e8856614d7
+refs/heads/master: c7617798771ad588d585986d896197c04b737621
diff --git a/trunk/arch/x86/xen/p2m.c b/trunk/arch/x86/xen/p2m.c
@@ -605,7 +605,8 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 
 		/* Swap over from MISSING to IDENTITY if needed. */
 		if (p2m_top[topidx][mididx] == p2m_missing) {
-			p2m_top[topidx][mididx] = p2m_identity;
+			WARN_ON(cmpxchg(&p2m_top[topidx][mididx], p2m_missing,
+				p2m_identity) != p2m_missing);
 			return true;
 		}
 	}