From bd849d29120d6443ffc8628c7fcb4d4e8a02f59e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 8 Aug 2011 16:11:36 +0200 Subject: [PATCH] --- yaml --- r: 271500 b: refs/heads/master c: 77e675ad825d1106f973afd353e8af84cd8d3960 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_segment.S | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 89f1e8bab5be..a6cf124628d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04fcc11bb5653c421f11f109d8b79ea5eb9fedb4 +refs/heads/master: 77e675ad825d1106f973afd353e8af84cd8d3960 diff --git a/trunk/arch/powerpc/kvm/book3s_segment.S b/trunk/arch/powerpc/kvm/book3s_segment.S index aed32e517212..678b6be31693 100644 --- a/trunk/arch/powerpc/kvm/book3s_segment.S +++ b/trunk/arch/powerpc/kvm/book3s_segment.S @@ -213,11 +213,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE) beq ld_last_inst cmpwi r12, BOOK3S_INTERRUPT_PROGRAM beq ld_last_inst + cmpwi r12, BOOK3S_INTERRUPT_SYSCALL + beq ld_last_prev_inst cmpwi r12, BOOK3S_INTERRUPT_ALIGNMENT beq- ld_last_inst b no_ld_last_inst +ld_last_prev_inst: + addi r3, r3, -4 + ld_last_inst: /* Save off the guest instruction we're at */