projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d2ec2f
)
MIPS: KVM: Fix unused variable build warning
author
Nicholas Mc Guire
<
[email protected]
>
Fri, 8 May 2015 15:38:52 +0000
(17:38 +0200)
committer
Ralf Baechle
<
[email protected]
>
Tue, 12 May 2015 21:53:56 +0000
(23:53 +0200)
As kvm_mips_complete_mmio_load() did not yet modify PC at this point
as James Hogans <
[email protected]
> explained the curr_pc variable
and the comments along with it can be dropped.
Signed-off-by: Nicholas Mc Guire <
[email protected]
>
Link:
http://lkml.org/lkml/2015/5/8/422
Cc: Gleb Natapov <
[email protected]
>
Cc: Paolo Bonzini <
[email protected]
>
Cc: James Hogan <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Cc:
[email protected]
Patchwork: https://patchwork.linux-mips.org/patch/9993/
Signed-off-by: Ralf Baechle <
[email protected]
>
arch/mips/kvm/emulate.c
patch
|
blob
|
history
diff --git
a/arch/mips/kvm/emulate.c
b/arch/mips/kvm/emulate.c
index 6230f376a44e7ab6f09041c4b805e54e59468489..4b50c5787e25bdb4bdb28eb7736296e1d5d3812c 100644
(file)
--- 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,
{
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;