]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
MIPS: KVM: Drop redundant restore of DDATA_LO
authorJames Hogan <james.hogan@imgtec.com>
Thu, 23 Jun 2016 16:34:44 +0000 (17:34 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Jul 2016 14:08:53 +0000 (16:08 +0200)
On return from the exit handler to the host (without re-entering the
guest) we restore the saved value of the DDATA_LO register which we use
as a scratch register. However we've already restored it ready for
calling the exit handler so there is no need to do it again, so drop
that code.

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
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/mips/kvm/entry.c

index 53e1e576d18a4806794e7212ca62db7ca1e903aa..6395bfa7e542606c8a90a2de75240340b01cc4b7 100644 (file)
@@ -581,10 +581,6 @@ static void *kvm_mips_build_ret_to_host(void *addr)
        UASM_i_LW(&p, K1, offsetof(struct kvm_vcpu_arch, host_stack), K1);
        uasm_i_addiu(&p, K1, K1, -(int)sizeof(struct pt_regs));
 
-       /* Restore host DDATA_LO */
-       UASM_i_LW(&p, K0, offsetof(struct pt_regs, cp0_epc), K1);
-       uasm_i_mtc0(&p, K0, C0_DDATA_LO);
-
        /*
         * r2/v0 is the return code, shift it down by 2 (arithmetic)
         * to recover the err code