Received-SPF: pass (google.com: domain of linux-kernel+bounces-137853-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Wed, 10 Apr 2024 12:47:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>, Michael Ellerman
 <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>, Christophe Leroy
 <christophe.leroy@csgroup.eu>, "Aneesh Kumar K.V"
 <aneesh.kumar@kernel.org>, "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>,
 Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>,
 Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger
 <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Ingo
 Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen
 <dave.hansen@linux.intel.com>, x86@kernel.org, "H. Peter Anvin"
 <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>, Vincenzo Frascino
 <vincenzo.frascino@arm.com>, John Stultz <jstultz@google.com>, Stephen Boyd
 <sboyd@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Randy Dunlap
 <rdunlap@infradead.org>, Bjorn Helgaas <bhelgaas@google.com>, Arnd Bergmann
 <arnd@arndb.de>, Anna-Maria Behnsen <anna-maria@linutronix.de>,
 linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
 linux-s390@vger.kernel.org
Subject: Re: [PATCH] vdso: Fix powerpc build U64_MAX undeclared error
Message-ID: <20240410124735.4c118aba@canb.auug.org.au>
In-Reply-To: <20240409062639.3393-1-adrian.hunter@intel.com>
References: <20240409062639.3393-1-adrian.hunter@intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vOfEbzDCAvOKJVGaVwivnDx";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/vOfEbzDCAvOKJVGaVwivnDx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Adrian,

On Tue,  9 Apr 2024 09:26:39 +0300 Adrian Hunter <adrian.hunter@intel.com> =
wrote:
>
> U64_MAX is not in include/vdso/limits.h, although that isn't noticed on x=
86
> because x86 includes include/linux/limits.h indirectly. However powerpc
> is more selective, resulting in the following build error:
>=20
>   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
>         |                                 ^~~~~~~
>=20
> Use ULLONG_MAX instead which will work just as well and is in
> include/vdso/limits.h.
>=20
> Reported-by: Stephen Rothwell <sfr@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@intel.com>
> ---
>  lib/vdso/gettimeofday.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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
> =20
>  #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
> --=20
> 2.34.1
>=20

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

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

--=20
Cheers,
Stephen Rothwell

--Sig_/vOfEbzDCAvOKJVGaVwivnDx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYV/ccACgkQAVBC80lX
0GyhBgf+Jf8pX6z5I6OHsmD8CbYP6GnKCBxvh+gR4ghWc9UAElgV+QAxw5qUh13q
pwIl5H6aCeg7RoNnVXYeIXDu7lzsJCgMWXwAC9Cl5us+ob0kvhCp33VGNZAFNBRr
6I6OSBNcIOpYtvjtMGHuD59I+u6X7v6vFJvQPBh0AdTHT+RnL3FGbV6kJGcF3+fs
HYIU3+af8/QqSYJ6bYu1Mr+YuRtWlQaQf+M+tPgFumWJEqqZnPfswcEHYlEvXU0L
HZrGroFagXi+Cl5pkmHWNaJIIzJpP9w8Fsyrc1D8iutNbEVrrXsiaKx0xROEIIx1
WGN5Qw9igAxfEy8yrGK8VRo74cTy6Q==
=GLls
-----END PGP SIGNATURE-----

--Sig_/vOfEbzDCAvOKJVGaVwivnDx--