From: Gautham R. Shenoy Date: Thu, 21 May 2015 08:27:04 +0000 (+0530) Subject: KVM: PPC: Book3S HV: Pass the correct trap argument to kvmhv_commence_exit X-Git-Tag: v4.1.11~194 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d9cc6c15c8a1019263ab8a85eeb38dcf3c3c9d6;p=users%2Fjedix%2Flinux-maple.git KVM: PPC: Book3S HV: Pass the correct trap argument to kvmhv_commence_exit commit 7e022e717f54897e396504306d0c9b61452adf4e upstream. In guest_exit_cont we call kvmhv_commence_exit which expects the trap number as the argument. However r3 doesn't contain the trap number at this point and as a result we would be calling the function with a spurious trap number. Fix this by copying r12 into r3 before calling kvmhv_commence_exit as r12 contains the trap number. Fixes: eddb60fb1443 Signed-off-by: Gautham R. Shenoy Signed-off-by: Paul Mackerras Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 3b2d2c5b6376..ffd98b2bfa16 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -1171,6 +1171,7 @@ mc_cont: bl kvmhv_accumulate_time #endif + mr r3, r12 /* Increment exit count, poke other threads to exit */ bl kvmhv_commence_exit nop