Commit 4a09ddb8 authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch kvm-arm64/kerneldoc into kvmarm/next 



* kvm-arm64/kerneldoc:
  : kerneldoc warning fixes, courtesy of Randy Dunlap
  :
  : Fixes addressing the widespread misuse of kerneldoc-style comments
  : throughout KVM/arm64.
  KVM: arm64: vgic: fix a kernel-doc warning
  KVM: arm64: vgic-its: fix kernel-doc warnings
  KVM: arm64: vgic-init: fix a kernel-doc warning
  KVM: arm64: sys_regs: fix kernel-doc warnings
  KVM: arm64: PMU: fix kernel-doc warnings
  KVM: arm64: mmu: fix a kernel-doc warning
  KVM: arm64: vhe: fix a kernel-doc warning
  KVM: arm64: hyp/aarch32: fix kernel-doc warnings
  KVM: arm64: guest: fix kernel-doc warnings
  KVM: arm64: debug: fix kernel-doc warnings

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents 9bd8d7df e634ff95

arch/arm64/kvm/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


static DEFINE_PER_CPU(u64, mdcr_el2);



/**

/*

 * save/restore_guest_debug_regs

 *

 * For some debug operations we need to tweak some guest registers. As
@@ -143,6 +143,7 @@ void kvm_arm_vcpu_init_debug(struct kvm_vcpu *vcpu) 


/**

 * kvm_arm_reset_debug_ptr - reset the debug ptr to point to the vcpu state

 * @vcpu:	the vcpu pointer

 */



void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)

arch/arm64/kvm/guest.c

+5 −2
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ static int copy_sve_reg_indices(const struct kvm_vcpu *vcpu, 


/**

 * kvm_arm_num_regs - how many registers do we present via KVM_GET_ONE_REG

 * @vcpu: the vCPU pointer

 *

 * This is for all registers.

 */
@@ -729,6 +730,8 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) 


/**

 * kvm_arm_copy_reg_indices - get indices of all registers.

 * @vcpu: the vCPU pointer

 * @uindices: register list to copy

 *

 * We do core registers right here, then we append system regs.

 */
@@ -902,8 +905,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 


/**

 * kvm_arch_vcpu_ioctl_set_guest_debug - set up guest debugging

 * @kvm:	pointer to the KVM struct

 * @kvm_guest_debug: the ioctl data buffer

 * @vcpu: the vCPU pointer

 * @dbg: the ioctl data buffer

 *

 * This sets up and enables the VM for guest debugging. Userspace

 * passes in a control flag to enable different debug types and

arch/arm64/kvm/hyp/aarch32.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu) 
}



/**

 * adjust_itstate - adjust ITSTATE when emulating instructions in IT-block

 * kvm_adjust_itstate - adjust ITSTATE when emulating instructions in IT-block

 * @vcpu:	The VCPU pointer

 *

 * When exceptions occur while instructions are executed in Thumb IF-THEN
@@ -120,7 +120,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu) 
}



/**

 * kvm_skip_instr - skip a trapped instruction and proceed to the next

 * kvm_skip_instr32 - skip a trapped instruction and proceed to the next

 * @vcpu: The vcpu pointer

 */

void kvm_skip_instr32(struct kvm_vcpu *vcpu)

arch/arm64/kvm/hyp/vhe/sysreg-sr.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu) 
}



/**

 * __vcpu_put_switch_syregs - Restore host system registers to the physical CPU

 * __vcpu_put_switch_sysregs - Restore host system registers to the physical CPU

 *

 * @vcpu: The VCPU pointer

 *

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void invalidate_icache_guest_page(void *va, size_t size) 
 * does.

 */

/**

 * unmap_stage2_range -- Clear stage2 page table entries to unmap a range

 * __unmap_stage2_range -- Clear stage2 page table entries to unmap a range

 * @mmu:   The KVM stage-2 MMU pointer

 * @start: The intermediate physical base address of the range to unmap

 * @size:  The size of the area to unmap