Commit d394bb77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - fix missed change for PTR->PTR_WD conversion

 - kernel-doc fixes

* tag 'mips-fixes-5.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: KVM: fix vz.c kernel-doc notation
  MIPS: octeon: Fix missed PTR->PTR_WD conversion
parents 88808fbb 2161ba07

arch/mips/cavium-octeon/octeon-memcpy.S

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define EXC(inst_reg,addr,handler)		\

9:	inst_reg, addr;				\

	.section __ex_table,"a";		\

	PTR	9b, handler;			\

	PTR_WD	9b, handler;			\

	.previous



/*

arch/mips/kvm/vz.c

+9 −3
Original line number Diff line number Diff line
@@ -458,8 +458,8 @@ void kvm_vz_acquire_htimer(struct kvm_vcpu *vcpu) 
/**

 * _kvm_vz_save_htimer() - Switch to software emulation of guest timer.

 * @vcpu:	Virtual CPU.

 * @compare:	Pointer to write compare value to.

 * @cause:	Pointer to write cause value to.

 * @out_compare: Pointer to write compare value to.

 * @out_cause:	Pointer to write cause value to.

 *

 * Save VZ guest timer state and switch to software emulation of guest CP0

 * timer. The hard timer must already be in use, so preemption should be
@@ -1541,11 +1541,14 @@ static int kvm_trap_vz_handle_guest_exit(struct kvm_vcpu *vcpu) 
}



/**

 * kvm_trap_vz_handle_cop_unusuable() - Guest used unusable coprocessor.

 * kvm_trap_vz_handle_cop_unusable() - Guest used unusable coprocessor.

 * @vcpu:	Virtual CPU context.

 *

 * Handle when the guest attempts to use a coprocessor which hasn't been allowed

 * by the root context.

 *

 * Return: value indicating whether to resume the host or the guest

 * 	   (RESUME_HOST or RESUME_GUEST)

 */

static int kvm_trap_vz_handle_cop_unusable(struct kvm_vcpu *vcpu)

{
@@ -1592,6 +1595,9 @@ static int kvm_trap_vz_handle_cop_unusable(struct kvm_vcpu *vcpu) 
 *

 * Handle when the guest attempts to use MSA when it is disabled in the root

 * context.

 *

 * Return: value indicating whether to resume the host or the guest

 * 	   (RESUME_HOST or RESUME_GUEST)

 */

static int kvm_trap_vz_handle_msa_disabled(struct kvm_vcpu *vcpu)

{