[PATCH] vdso: Fix powerpc build U64_MAX undeclared error

Stephen Rothwell sfr at canb.auug.org.au
Wed Apr 10 12:47:35 AEST 2024


Hi Adrian,

On Tue,  9 Apr 2024 09:26:39 +0300 Adrian Hunter <adrian.hunter at intel.com> wrote:
>
> U64_MAX is not in include/vdso/limits.h, although that isn't noticed on x86
> because x86 includes include/linux/limits.h indirectly. However powerpc
> is more selective, resulting in the following build error:
> 
>   In file included from <command-line>:
>   lib/vdso/gettimeofday.c: In function 'vdso_calc_ns':
>   lib/vdso/gettimeofday.c:11:33: error: 'U64_MAX' undeclared
>      11 | # define VDSO_DELTA_MASK(vd)    U64_MAX
>         |                                 ^~~~~~~
> 
> Use ULLONG_MAX instead which will work just as well and is in
> include/vdso/limits.h.
> 
> Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> Closes: https://lore.kernel.org/all/20240409124905.6816db37@canb.auug.org.au/
> Fixes: c8e3a8b6f2e6 ("vdso: Consolidate vdso_calc_delta()")
> Signed-off-by: Adrian Hunter <adrian.hunter at intel.com>
> ---
>  lib/vdso/gettimeofday.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
> index 9c3a8d2440c9..899850bd6f0b 100644
> --- a/lib/vdso/gettimeofday.c
> +++ b/lib/vdso/gettimeofday.c
> @@ -8,7 +8,7 @@
>  #ifndef vdso_calc_ns
>  
>  #ifdef VDSO_DELTA_NOMASK
> -# define VDSO_DELTA_MASK(vd)	U64_MAX
> +# define VDSO_DELTA_MASK(vd)	ULLONG_MAX
>  #else
>  # define VDSO_DELTA_MASK(vd)	(vd->mask)
>  #endif
> -- 
> 2.34.1
> 

I have applied that to linux-next today and it builds for me.

Tested-by: Stephen Rothwell <sfr at canb.auug.org.au> # build only

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20240410/db3220be/attachment.sig>


More information about the Linuxppc-dev mailing list