[+ the rest of the KVM/arm64 maintainers/reviewers]
On Mon, 28 Oct 2024 07:31:38 +0000,
Nam Cao <namcao@linutronix.de> wrote:
>
> There is a newly introduced hrtimer_setup() which will replace
> hrtimer_init(). This new function is similar to the old one, except that it
> also sanity-checks and initializes the timer's callback function.
>
> Switch to use this new function.
>
> Signed-off-by: Nam Cao <namcao@linutronix.de>
> ---
> Cc: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/kvm/arch_timer.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c
> index 879982b1cc73..92e4fb5dcf52 100644
> --- a/arch/arm64/kvm/arch_timer.c
> +++ b/arch/arm64/kvm/arch_timer.c
> @@ -993,8 +993,7 @@ static void timer_context_init(struct kvm_vcpu *vcpu, int timerid)
> else
> ctxt->offset.vm_offset = &kvm->arch.timer_data.poffset;
>
> - hrtimer_init(&ctxt->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
> - ctxt->hrtimer.function = kvm_hrtimer_expire;
> + hrtimer_setup(&ctxt->hrtimer, kvm_hrtimer_expire, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
>
> switch (timerid) {
> case TIMER_PTIMER:
> @@ -1021,8 +1020,8 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
> timer_set_offset(vcpu_ptimer(vcpu), 0);
> }
>
> - hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
> - timer->bg_timer.function = kvm_bg_timer_expire;
> + hrtimer_setup(&timer->bg_timer, kvm_bg_timer_expire, CLOCK_MONOTONIC,
> + HRTIMER_MODE_ABS_HARD);
> }
>
> void kvm_timer_init_vm(struct kvm *kvm)
Acked-by: Marc Zyngier <maz@kernel.org>
M.
--
Without deviation from the norm, progress is not possible.