Re: [PATCH Dovetail 6.18, 7.0] lib/vdso: Fix build failure around CONFIG_GENERIC_VDSO_CLOCKSOURCE

Florian Bezdeka <[email protected]> writes:

> During the forward porting to 6.18 the signature of
> update_generic_mmio() changed and introduced one undeclared variable.
>
> At the same time the name of the kconfig variable got invalid.
>
> Signed-off-by: Florian Bezdeka <[email protected]>
> ---
>  kernel/time/vsyscall.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/time/vsyscall.c b/kernel/time/vsyscall.c
> index 13f6c9d91045..5fa096452dba 100644
> --- a/kernel/time/vsyscall.c
> +++ b/kernel/time/vsyscall.c
> @@ -76,7 +76,8 @@ static inline void update_vdso_time_data(struct vdso_time_data *vdata, struct ti
>  
>  static void update_generic_mmio(struct vdso_time_data *vdata, struct clocksource *cs)
>  {
> -#ifdef CONFIG_GENERIC_CLOCKSOURCE_VDSO
> +#ifdef CONFIG_GENERIC_VDSO_CLOCKSOURCE
> +	struct vdso_clock *vc = vdata->clock_data;
>  	u16 seq;
>  
>  	if (cs->vdso_type == (vc->cs_type_seq >> 16))

Merged, thanks.

-- 
Philippe.