diff options
Diffstat (limited to 'arch/arm64/kvm/arch_timer.c')
| -rw-r--r-- | arch/arm64/kvm/arch_timer.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c index 0696732fa38c..6dcdae4d38cb 100644 --- a/arch/arm64/kvm/arch_timer.c +++ b/arch/arm64/kvm/arch_timer.c @@ -827,8 +827,8 @@ static void timer_set_traps(struct kvm_vcpu *vcpu, struct timer_map *map)  	assign_clear_set_bit(tpt, CNTHCTL_EL1PCEN << 10, set, clr);  	assign_clear_set_bit(tpc, CNTHCTL_EL1PCTEN << 10, set, clr); -	/* This only happens on VHE, so use the CNTKCTL_EL1 accessor */ -	sysreg_clear_set(cntkctl_el1, clr, set); +	/* This only happens on VHE, so use the CNTHCTL_EL2 accessor. */ +	sysreg_clear_set(cnthctl_el2, clr, set);  }  void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu) @@ -1563,7 +1563,7 @@ no_vgic:  void kvm_timer_init_vhe(void)  {  	if (cpus_have_final_cap(ARM64_HAS_ECV_CNTPOFF)) -		sysreg_clear_set(cntkctl_el1, 0, CNTHCTL_ECV); +		sysreg_clear_set(cnthctl_el2, 0, CNTHCTL_ECV);  }  int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)  |