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

Commit caa1faa7 authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

MIPS: KVM: Trivial whitespace and style fixes 



A bunch of misc whitespace and style fixes within arch/mips/kvm/.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: kvm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11883/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 097d5638

arch/mips/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -2027,7 +2027,8 @@ config KVM_GUEST 
	bool "KVM Guest Kernel"

	depends on BROKEN_ON_SMP

	help

	  Select this option if building a guest kernel for KVM (Trap & Emulate) mode

	  Select this option if building a guest kernel for KVM (Trap & Emulate)

	  mode.



config KVM_GUEST_TIMER_FREQ

	int "Count/Compare Timer Frequency (MHz)"

arch/mips/kvm/emulate.c

+3 −5
Original line number Diff line number Diff line
@@ -1243,10 +1243,9 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, 
#ifdef KVM_MIPS_DEBUG_COP0_COUNTERS

			cop0->stat[MIPS_CP0_STATUS][0]++;

#endif

			if (rt != 0) {

			if (rt != 0)

				vcpu->arch.gprs[rt] =

				    kvm_read_c0_guest_status(cop0);

			}

			/* EI */

			if (inst & 0x20) {

				kvm_debug("[%#lx] mfmcz_op: EI\n",
@@ -2584,8 +2583,7 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause, 
	 */

	index = kvm_mips_guest_tlb_lookup(vcpu,

		      (va & VPN2_MASK) |

					  (kvm_read_c0_guest_entryhi

					   (vcpu->arch.cop0) & ASID_MASK));

		      (kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & ASID_MASK));

	if (index < 0) {

		if (exccode == T_TLB_LD_MISS) {

			er = kvm_mips_emulate_tlbmiss_ld(cause, opc, run, vcpu);

arch/mips/kvm/locore.S

+6 −6
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ NESTED (MIPSX(GuestException), CALLFRAME_SIZ, ra) 


	/* Now restore the host state just enough to run the handlers */



	/* Swtich EBASE to the one used by Linux */

	/* Switch EBASE to the one used by Linux */

	/* load up the host EBASE */

	mfc0	v0, CP0_STATUS

arch/mips/kvm/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -673,8 +673,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 


	local_irq_save(flags);



	if (((vcpu->arch.

	      guest_kernel_asid[cpu] ^ asid_cache(cpu)) & ASID_VERSION_MASK)) {

	if ((vcpu->arch.guest_kernel_asid[cpu] ^ asid_cache(cpu)) &

							ASID_VERSION_MASK) {

		kvm_get_new_mmu_context(&vcpu->arch.guest_kernel_mm, cpu, vcpu);

		vcpu->arch.guest_kernel_asid[cpu] =

		    vcpu->arch.guest_kernel_mm.context.asid[cpu];

arch/mips/include/asm/kvm_host.h

+1 −1

File changed.

Contains only whitespace changes.