| From: Nicholas Mc Guire <hofrat@osadl.org> |
| Date: Fri, 8 May 2015 17:38:52 +0200 |
| Subject: MIPS: KVM: Fix unused variable build warning |
| |
| commit 5f508c43a7648baa892528922402f1e13f258bd4 upstream. |
| |
| 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> |
| [bwh: Backported to 3.16: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/mips/kvm/kvm_mips_emul.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| --- a/arch/mips/kvm/kvm_mips_emul.c |
| +++ b/arch/mips/kvm/kvm_mips_emul.c |
| @@ -2172,7 +2172,6 @@ kvm_mips_complete_mmio_load(struct kvm_v |
| { |
| 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)) { |
| printk("Bad MMIO length: %d", run->mmio.len); |
| @@ -2180,11 +2179,6 @@ kvm_mips_complete_mmio_load(struct kvm_v |
| 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; |
