Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26ee17ff authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

MIPS: KVM: Drop unused hpa0/hpa1 args from function 



The function kvm_mips_handle_mapped_seg_tlb_fault() has two completely
unused pointer arguments, hpa0 and hpa1, for which all users always pass
NULL.

Drop these two arguments and update the callers.

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

arch/mips/include/asm/kvm_host.h

+1 −3
Original line number Diff line number Diff line
@@ -630,9 +630,7 @@ extern int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr, 
					      struct kvm_vcpu *vcpu);



extern int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,

						struct kvm_mips_tlb *tlb,

						unsigned long *hpa0,

						unsigned long *hpa1);

						struct kvm_mips_tlb *tlb);



extern enum emulation_result kvm_mips_handle_tlbmiss(u32 cause,

						     u32 *opc,

arch/mips/kvm/emulate.c

+2 −5
Original line number Diff line number Diff line
@@ -1633,9 +1633,7 @@ enum emulation_result kvm_mips_emulate_cache(u32 inst, u32 *opc, 
				 * We fault an entry from the guest tlb to the

				 * shadow host TLB

				 */

				kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb,

								     NULL,

								     NULL);

				kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb);

			}

		}

	} else {
@@ -2599,8 +2597,7 @@ enum emulation_result kvm_mips_handle_tlbmiss(u32 cause, 
			 * OK we have a Guest TLB entry, now inject it into the

			 * shadow host TLB

			 */

			kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb, NULL,

							     NULL);

			kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb);

		}

	}

arch/mips/kvm/mmu.c

+2 −11
Original line number Diff line number Diff line
@@ -130,9 +130,7 @@ int kvm_mips_handle_kseg0_tlb_fault(unsigned long badvaddr, 
}



int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,

					 struct kvm_mips_tlb *tlb,

					 unsigned long *hpa0,

					 unsigned long *hpa1)

					 struct kvm_mips_tlb *tlb)

{

	unsigned long entryhi = 0, entrylo0 = 0, entrylo1 = 0;

	struct kvm *kvm = vcpu->kvm;
@@ -157,12 +155,6 @@ int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu, 
					    >> PAGE_SHIFT];

	}



	if (hpa0)

		*hpa0 = pfn0 << PAGE_SHIFT;



	if (hpa1)

		*hpa1 = pfn1 << PAGE_SHIFT;



	/* Get attributes from the Guest TLB */

	entrylo0 = mips3_paddr_to_tlbpfn(pfn0 << PAGE_SHIFT) | (0x3 << 3) |

		   (tlb->tlb_lo0 & MIPS3_PG_D) | (tlb->tlb_lo0 & MIPS3_PG_V);
@@ -354,8 +346,7 @@ u32 kvm_get_inst(u32 *opc, struct kvm_vcpu *vcpu) 
			}

			kvm_mips_handle_mapped_seg_tlb_fault(vcpu,

							     &vcpu->arch.

							     guest_tlb[index],

							     NULL, NULL);

							     guest_tlb[index]);

			inst = *(opc);

		}

		local_irq_restore(flags);