On Fri, 22 Feb 2019 08:49:42 +0000
Julien Thierry <julien.thierry at arm.com> wrote:
> Hi Shaokun,
>
> On 22/02/2019 06:34, Shaokun Zhang wrote:
> > The 'timer' local variable became unused after commit bee038a67487
> > ("KVM: arm/arm64: Rework the timer code to use a timer_map").
> > Remove it to avoid [-Wunused-but-set-variable] warning.
> >
> > Cc: Christoffer Dall <christoffer.dall at arm.com>
> > Cc: Marc Zyngier <marc.zyngier at arm.com>
> > Cc: James Morse <james.morse at arm.com>
> > Cc: Julien Thierry <julien.thierry at arm.com>
> > Cc: Suzuki K Pouloze <suzuki.poulose at arm.com>
> > Signed-off-by: Shaokun Zhang <zhangshaokun at hisilicon.com>
> > ---
> > virt/kvm/arm/arch_timer.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
> > index af8f2f1d01cc..3417f2dbc366 100644
> > --- a/virt/kvm/arm/arch_timer.c
> > +++ b/virt/kvm/arm/arch_timer.c
> > @@ -236,14 +236,12 @@ static enum hrtimer_restart kvm_hrtimer_expire(struct hrtimer *hrt)
> >
> > static bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx)
> > {
> > - struct arch_timer_cpu *timer;
> > enum kvm_arch_timers index;
> > u64 cval, now;
> >
> > if (!timer_ctx)
> > return false;
> >
> > - timer = vcpu_timer(timer_ctx->vcpu);
> > index = arch_timer_ctx_index(timer_ctx);
> >
> > if (timer_ctx->loaded) {
>
> This seems to be a consequence of moving the loaded state from
> arch_timer_cpu to arch_timer_context. Thanks for fixing it.
>
> Reviewed-by: Julien Thierry <julien.thierry at arm.com>
Applied to -next.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
