* [PATCH] vdso: Fix powerpc build U64_MAX undeclared error
@ 2024-04-09 6:26 Adrian Hunter
2024-04-09 17:07 ` John Stultz
2024-04-10 2:47 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Hunter @ 2024-04-09 6:26 UTC (permalink / raw)
To: Thomas Gleixner, Stephen Rothwell
Cc: Michael Ellerman, Nicholas Piggin, Christophe Leroy,
Aneesh Kumar K.V, Naveen N. Rao, Heiko Carstens, Vasily Gorbik,
Alexander Gordeev, Christian Borntraeger, Sven Schnelle,
Ingo Molnar, Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Andy Lutomirski, Vincenzo Frascino, John Stultz, Stephen Boyd,
Peter Zijlstra, Randy Dunlap, Bjorn Helgaas, Arnd Bergmann,
Anna-Maria Behnsen, linuxppc-dev, linux-kernel, linux-s390
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@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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] vdso: Fix powerpc build U64_MAX undeclared error
2024-04-09 6:26 [PATCH] vdso: Fix powerpc build U64_MAX undeclared error Adrian Hunter
@ 2024-04-09 17:07 ` John Stultz
2024-04-10 2:47 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: John Stultz @ 2024-04-09 17:07 UTC (permalink / raw)
To: Adrian Hunter
Cc: Thomas Gleixner, Stephen Rothwell, Michael Ellerman,
Nicholas Piggin, Christophe Leroy, Aneesh Kumar K.V,
Naveen N. Rao, Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Andy Lutomirski, Vincenzo Frascino, Stephen Boyd, Peter Zijlstra,
Randy Dunlap, Bjorn Helgaas, Arnd Bergmann, Anna-Maria Behnsen,
linuxppc-dev, linux-kernel, linux-s390
On Mon, Apr 8, 2024 at 11:27 PM Adrian Hunter <adrian.hunter@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@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>
Acked-by: John Stultz <jstultz@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] vdso: Fix powerpc build U64_MAX undeclared error
2024-04-09 6:26 [PATCH] vdso: Fix powerpc build U64_MAX undeclared error Adrian Hunter
2024-04-09 17:07 ` John Stultz
@ 2024-04-10 2:47 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-04-10 2:47 UTC (permalink / raw)
To: Adrian Hunter
Cc: Thomas Gleixner, Michael Ellerman, Nicholas Piggin,
Christophe Leroy, Aneesh Kumar K.V, Naveen N. Rao, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Andy Lutomirski, Vincenzo Frascino, John Stultz,
Stephen Boyd, Peter Zijlstra, Randy Dunlap, Bjorn Helgaas,
Arnd Bergmann, Anna-Maria Behnsen, linuxppc-dev, linux-kernel,
linux-s390
[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]
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 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@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(-)
>
> 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@canb.auug.org.au> # build only
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-10 2:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-09 6:26 [PATCH] vdso: Fix powerpc build U64_MAX undeclared error Adrian Hunter
2024-04-09 17:07 ` John Stultz
2024-04-10 2:47 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox