KVM: PPC: Make Alignment interrupts work again
authorAlexander Graf <agraf@suse.de>
Tue, 20 Apr 2010 00:49:49 +0000 (02:49 +0200)
committerAvi Kivity <avi@redhat.com>
Mon, 17 May 2010 09:19:00 +0000 (12:19 +0300)
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 <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/powerpc/kvm/book3s_segment.S

index 4c0d1d85d20af3f503640d2a7cb235e4423bcfa8..7c52ed0b7051b5748fe3c943c60de5ff18b616b2 100644 (file)
@@ -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