---

yaml --- r: 300284 b: refs/heads/master c: 32c7dbf h: refs/heads/master v: v3
git-mirror · May 16, 2012 · bc9bd4b · bc9bd4b
1 parent b7ac29f
commit bc9bd4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56e13dbae3eddb1648e6e94ae251c83cdc8304e0
+refs/heads/master: 32c7dbfd479e73684b0d23fcb0a5cb04f19d86f4
diff --git a/trunk/arch/powerpc/kvm/book3s_segment.S b/trunk/arch/powerpc/kvm/book3s_segment.S
@@ -197,8 +197,8 @@ kvmppc_interrupt:
 	/* Save guest PC and MSR */
 #ifdef CONFIG_PPC64
 BEGIN_FTR_SECTION
-	mr	r10, r12
-	andi.	r0,r12,0x2
+	andi.	r0, r12, 0x2
+	cmpwi	cr1, r0, 0
 	beq	1f
 	mfspr	r3,SPRN_HSRR0
 	mfspr	r4,SPRN_HSRR1
@@ -345,8 +345,7 @@ no_dcbz32_off:
 
 #ifdef CONFIG_PPC64
 BEGIN_FTR_SECTION
-	andi.	r0,r10,0x2
-	beq	1f
+	beq	cr1, 1f
 	mtspr	SPRN_HSRR1, r6
 	mtspr	SPRN_HSRR0, r8
 END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)