---

yaml --- r: 343523 b: refs/heads/master c: 8b5869a h: refs/heads/master i: 343521: 3fb7296 343519: bf79374 v: v3
git-mirror · Oct 30, 2012 · 757e37b · 757e37b
1 parent 9eaf7e0
commit 757e37b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f8c8c7812976fbfaf4bb30aaf8f6b001864f20a
+refs/heads/master: 8b5869ad85f703ffeb25e656eab826f6b85b984c
diff --git a/trunk/arch/powerpc/include/asm/kvm_book3s_64.h b/trunk/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -60,7 +60,7 @@ static inline long try_lock_hpte(unsigned long *hpte, unsigned long bits)
 		     "	ori	%0,%0,%4\n"
 		     "  stdcx.	%0,0,%2\n"
 		     "	beq+	2f\n"
-		     "	li	%1,%3\n"
+		     "	mr	%1,%3\n"
 		     "2:	isync"
 		     : "=&r" (tmp), "=&r" (old)
 		     : "r" (hpte), "r" (bits), "i" (HPTE_V_HVLOCK)