From: Alexander Graf Date: Tue, 20 Apr 2010 00:49:49 +0000 (+0200) Subject: KVM: PPC: Make Alignment interrupts work again X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6fc558258077d4e44b1780c0fd4ef93dd96c6fca;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git KVM: PPC: Make Alignment interrupts work again In the process of merging Book3S_32 and 64 I somehow ended up having the alignment interrupt handler take last_inst, but the fetching code not fetching it. So we ended up with stale last_inst values. Let's just enable last_inst fetching for alignment interrupts too. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity --- diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S index 4c0d1d85d20a..7c52ed0b7051 100644 --- a/arch/powerpc/kvm/book3s_segment.S +++ b/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