Commit be854384 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.16-6' of... 

Merge tag 'kvmarm-fixes-6.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.16, take #6

- Fix use of u64_replace_bits() in adjusting the guest's view of
  MDCR_EL2.HPMN.
parents 8a73c8db 2265c08e

arch/arm64/kvm/sys_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -2624,7 +2624,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, 
	 */

	if (hpmn > vcpu->kvm->arch.nr_pmu_counters) {

		hpmn = vcpu->kvm->arch.nr_pmu_counters;

		u64_replace_bits(val, hpmn, MDCR_EL2_HPMN);

		u64p_replace_bits(&val, hpmn, MDCR_EL2_HPMN);

	}



	__vcpu_assign_sys_reg(vcpu, MDCR_EL2, val);