MIPS: KVM: Drop unused guest_inst from kvm_vcpu_arch

The MIPS kvm_vcpu_arch::guest_inst isn't used, so drop it from the
struct and drop its asm-offsets definition.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 36a391d289aa09494b4892f995a3c2f591ed837a..b310bb348443ed249fc155ecc6472680c41370d8 100644 (file)
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -347,7 +347,6 @@ struct kvm_vcpu_arch {
        unsigned long host_cp0_cause;
        unsigned long host_cp0_epc;
        unsigned long host_cp0_entryhi;
-       uint32_t guest_inst;
 
        /* GPRS */
        unsigned long gprs[32];

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 1ea973b2abb1e0365db6ee4b867d3e32d355953c..4d96a9033f46aa546d7a4a2e8856fcade39e4fde 100644 (file)
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -366,8 +366,6 @@ void output_kvm_defines(void)
        OFFSET(VCPU_HOST_EPC, kvm_vcpu_arch, host_cp0_epc);
        OFFSET(VCPU_HOST_ENTRYHI, kvm_vcpu_arch, host_cp0_entryhi);
 
-       OFFSET(VCPU_GUEST_INST, kvm_vcpu_arch, guest_inst);
-
        OFFSET(VCPU_R0, kvm_vcpu_arch, gprs[0]);
        OFFSET(VCPU_R1, kvm_vcpu_arch, gprs[1]);
        OFFSET(VCPU_R2, kvm_vcpu_arch, gprs[2]);