Commit 5f508c43 authored May 08, 2015 by Nicholas Mc Guire Committed by Ralf Baechle May 12, 2015

MIPS: KVM: Fix unused variable build warning

As kvm_mips_complete_mmio_load() did not yet modify PC at this point
as James Hogans <james.hogan@imgtec.com> explained the curr_pc variable
and the comments along with it can be dropped.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Link: http://lkml.org/lkml/2015/5/8/422
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: kvm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9993/

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 2d2ec2f7

arch/mips/kvm/emulate.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2389,7 +2389,6 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,
		{
		unsigned long *gpr = &vcpu->arch.gprs[vcpu->arch.io_gpr];
		enum emulation_result er = EMULATE_DONE;
		unsigned long curr_pc;

		if (run->mmio.len > sizeof(*gpr)) {
		kvm_err("Bad MMIO length: %d", run->mmio.len);
		@@ -2397,11 +2396,6 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,
		goto done;
		}

		/*
		* Update PC and hold onto current PC in case there is
		* an error and we want to rollback the PC
		*/
		curr_pc = vcpu->arch.pc;
		er = update_pc(vcpu, vcpu->arch.pending_load_cause);
		if (er == EMULATE_FAIL)
		return er;

Admin message