---

yaml --- r: 197794 b: refs/heads/master c: 6fc5582 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · 9928656 · 9928656
1 parent e2c550b
commit 9928656
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7bc74e1c306636a659a04805474b2f8fcbd1f7e
+refs/heads/master: 6fc558258077d4e44b1780c0fd4ef93dd96c6fca
diff --git a/trunk/arch/powerpc/kvm/book3s_segment.S b/trunk/arch/powerpc/kvm/book3s_segment.S
@@ -196,6 +196,8 @@ kvmppc_handler_trampoline_exit:
 	beq	ld_last_inst
 	cmpwi	r12, BOOK3S_INTERRUPT_PROGRAM
 	beq	ld_last_inst
+	cmpwi	r12, BOOK3S_INTERRUPT_ALIGNMENT
+	beq-	ld_last_inst
 
 	b	no_ld_last_inst