| Message ID | 20190829111843.41003-3-vincenzo.frascino@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | vdso: Complete the conversion to 32bit syscalls | expand |
On Thu, Aug 29, 2019 at 4:19 AM Vincenzo Frascino <vincenzo.frascino@arm.com> wrote: > > clock_gettime32 and clock_getres_time32 should be compiled only with a > 32 bit vdso library. > > Exclude these symbols when BUILD_VDSO32 is not defined. Reviewed-by: Andy Lutomirski <luto@kernel.org> BTW, this is a great patch: it's either correct or it won't build. I like patches like that.
On 29/08/2019 16:23, Andy Lutomirski wrote: > On Thu, Aug 29, 2019 at 4:19 AM Vincenzo Frascino > <vincenzo.frascino@arm.com> wrote: >> >> clock_gettime32 and clock_getres_time32 should be compiled only with a >> 32 bit vdso library. >> >> Exclude these symbols when BUILD_VDSO32 is not defined. > > Reviewed-by: Andy Lutomirski <luto@kernel.org> > > BTW, this is a great patch: it's either correct or it won't build. I > like patches like that. > Thanks :)
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c index e630e7ff57f1..a86e89e6dedc 100644 --- a/lib/vdso/gettimeofday.c +++ b/lib/vdso/gettimeofday.c @@ -117,6 +117,7 @@ __cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts) return 0; } +#ifdef BUILD_VDSO32 static __maybe_unused int __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res) { @@ -139,6 +140,7 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res) } return ret; } +#endif /* BUILD_VDSO32 */ static __maybe_unused int __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) @@ -229,6 +231,7 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res) return 0; } +#ifdef BUILD_VDSO32 static __maybe_unused int __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res) { @@ -251,4 +254,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res) } return ret; } +#endif /* BUILD_VDSO32 */ #endif /* VDSO_HAS_CLOCK_GETRES */
clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library. Exclude these symbols when BUILD_VDSO32 is not defined. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andy Lutomirski <luto@kernel.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- lib/vdso/gettimeofday.c | 4 ++++ 1 file changed, 4 insertions(+)