summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2010-04-20 02:49:49 +0200
committerAvi Kivity <avi@redhat.com>2010-05-17 11:19:00 +0200
commit6fc558258077d4e44b1780c0fd4ef93dd96c6fca (patch)
tree13a433eab634b3893f71f2a876932674676c462d /arch/powerpc/kvm
parentKVM: PPC: Improve split mode (diff)
downloadlinux-6fc558258077d4e44b1780c0fd4ef93dd96c6fca.tar.xz
linux-6fc558258077d4e44b1780c0fd4ef93dd96c6fca.zip
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 <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/book3s_segment.S2
1 files changed, 2 insertions, 0 deletions
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