From 757e37b87eb1df1f70ae1980c04e12a6995dc504 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 15 Oct 2012 01:20:50 +0000 Subject: [PATCH] --- yaml --- r: 343523 b: refs/heads/master c: 8b5869ad85f703ffeb25e656eab826f6b85b984c h: refs/heads/master i: 343521: 3fb7296f88c4480a9502c786a780db962b8b3474 343519: bf793749d72b98a206ecf806285933f0eec001c1 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/kvm_book3s_64.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 796bfff8887c..d696807eb121 100644 --- 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 index 0dd1d86d3e31..1472a5b4e4e3 100644 --- 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)