- fix missed change for PTR->PTR_WD conversion
- kernel-doc fixes -----BEGIN PGP SIGNATURE----- iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmH7l90aHHRzYm9nZW5k QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHANHQ//Z2utUjKa81s21yzs0SIy 352GKbwGyyTQ/HfgtYwOR7j1tR2P3J00bUT5/2cH/l00PTZxGbAYxWtRkYCHYCXB GWd3JXIatJlmteu5xPX2bWBsFj5zgvhEC1VNo0vGGRzTGWVVa3kBxWIGUH0Hk7Kz rmiSVdmv579Ib39dPRE8CMYadtoX7QAUYicWeTuhdScWgALqccJY/GUSDOKU1fpy FghFjSxPDJQP4oogIB41fEDFYeR0GdIR5C5zvKBQ39K3vAfzpB4hauVVnCYLDTU/ OoNYqDrdroQk7g5YgqwztyLDfPtivF0v04EZZs3lM5+O4S5kKoSmgrlxnYXpzkFe cBdlwW4auLxMv6cYSK/MYClZRtLPKQkKTkMvVcC0FQuCcAzq2+dE3R2YFkTECXjh Lbf5JNB2445eS6skzmMBcxutkRJQaFIZ4B9eMGraNnXaHNFGxERSYzjoiIF8ndNZ yGlm8U/opPyBhpbdIyTWvikR/z2jA2VKIN8jNwC4tvk+PmgURZ3jDTahxrS4kuns qF1H8yTXhU05v93qMoeOxnTUKHfzB/Wo3FXQWAg5ovoj/+SEMnzAt6yJCJfYOQ7x A8ujSSMssuBFgxOFYt2h6yBts8MSvC6edhEaJoezFOrA9uyaDkAkK3Hu6SQn8IyR H9/9R12X+39fLbRoPOXgyCM= =0NAK -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
d394bb77dd
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче