aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-05-08 11:38:52 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-05-12 17:53:56 -0400
commit5f508c43a7648baa892528922402f1e13f258bd4 (patch)
treedfcc3d731929615566bad2140eb6f91debe9fb57 /arch
parent2d2ec2f7c9560aa12417e5d8c26fe159cfdd3827 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kvm/emulate.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 6230f376a44e..4b50c5787e25 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -2389,7 +2389,6 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,
2389{ 2389{
2390 unsigned long *gpr = &vcpu->arch.gprs[vcpu->arch.io_gpr]; 2390 unsigned long *gpr = &vcpu->arch.gprs[vcpu->arch.io_gpr];
2391 enum emulation_result er = EMULATE_DONE; 2391 enum emulation_result er = EMULATE_DONE;
2392 unsigned long curr_pc;
2393 2392
2394 if (run->mmio.len > sizeof(*gpr)) { 2393 if (run->mmio.len > sizeof(*gpr)) {
2395 kvm_err("Bad MMIO length: %d", run->mmio.len); 2394 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,
2397 goto done; 2396 goto done;
2398 } 2397 }
2399 2398
2400 /*
2401 * Update PC and hold onto current PC in case there is
2402 * an error and we want to rollback the PC
2403 */
2404 curr_pc = vcpu->arch.pc;
2405 er = update_pc(vcpu, vcpu->arch.pending_load_cause); 2399 er = update_pc(vcpu, vcpu->arch.pending_load_cause);
2406 if (er == EMULATE_FAIL) 2400 if (er == EMULATE_FAIL)
2407 return er; 2401 return er;