summaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2016-10-25 16:11:11 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-10-26 13:43:48 +0200
commitede5f3e7b54a4347be4d8525269eae50902bd7cd (patch)
tree78b8181810740891d519aaac0e7ed99375338afd /virt
parent9078210ef4016539c909fb67164d3f1c27323d8b (diff)
KVM: MIPS: Make ERET handle ERL before EXL
The ERET instruction to return from exception is used for returning from exception level (Status.EXL) and error level (Status.ERL). If both bits are set however we should be returning from ERL first, as ERL can interrupt EXL, for example when an NMI is taken. KVM however checks EXL first. Fix the order of the checks to match the pseudocode in the instruction set manual. Fixes: e685c689f3a8 ("KVM/MIPS32: Privileged instruction/target branch emulation.") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Radim Krčmář <rkrcmar@redhat.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Cc: <stable@vger.kernel.org> # 3.10.x- Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions