[PATCH] PPC: Fix typo in rebolting code

[PATCH] PPC: Fix typo in rebolting code

[Alexander Graf]

When we're loading bolted entries into the SLB again, we're checking if an
entry is in use and only slbmte it when it is.

Unfortunately, the check always goes to the skip label of the first entry,
resulting in an endless loop when it actually gets triggered.

Signed-off-by: Alexander Graf <agraf-l3A5Bk7waGM@public.gmane.org>
---
 arch/powerpc/kvm/book3s_64_slb.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_64_slb.S b/arch/powerpc/kvm/book3s_64_slb.S
index ecd237a..8e44788 100644
--- a/arch/powerpc/kvm/book3s_64_slb.S
+++ b/arch/powerpc/kvm/book3s_64_slb.S
@@ -31,7 +31,7 @@
 #define REBOLT_SLB_ENTRY(num) \
 	ld	r10, SHADOW_SLB_ESID(num)(r11); \
 	cmpdi	r10, 0; \
-	beq	slb_exit_skip_1; \
+	beq	slb_exit_skip_ ## num; \
 	oris	r10, r10, SLB_ESID_V@h; \
 	ld	r9, SHADOW_SLB_VSID(num)(r11); \
 	slbmte	r9, r10; \
-- 
1.6.0.2

Re: [PATCH] PPC: Fix typo in rebolting code

[Marcelo Tosatti]

On Mon, Jan 04, 2010 at 10:19:22PM +0100, Alexander Graf wrote:
> When we're loading bolted entries into the SLB again, we're checking if an
> entry is in use and only slbmte it when it is.
> 
> Unfortunately, the check always goes to the skip label of the first entry,
> resulting in an endless loop when it actually gets triggered.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

Applied, thanks.