Skip to contentSkip to conversation

KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte()

PATCH In review Paul Mackerras 1 participant 1 message Oct 15, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 8/8 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte()

This fixes an error in the inline asm in try_lock_hpte() where we were erroneously using a register number as an immediate operand. The bug only affects an error path, and in fact the code will still work as long as the compiler chooses some register other than r0 for the "bits" variable. Nevertheless it should still be fixed.

---
 arch/powerpc/include/asm/kvm_book3s_64.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/kvm_book3s_64.h +1 -1
index 0dd1d86..1472a5b 100644
@@ -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)
Signature · 1 line
1.7.10.4