42874e4eb3
The VDSO functions are defined as globals in the kernel sources but intended to be called from userspace, so there is no need to declare them in a kernel side header. Without a prototype, this now causes warnings such as arch/mips/vdso/vgettimeofday.c:14:5: error: no previous prototype for '__vdso_clock_gettime' [-Werror=missing-prototypes] arch/mips/vdso/vgettimeofday.c:28:5: error: no previous prototype for '__vdso_gettimeofday' [-Werror=missing-prototypes] arch/mips/vdso/vgettimeofday.c:36:5: error: no previous prototype for '__vdso_clock_getres' [-Werror=missing-prototypes] arch/mips/vdso/vgettimeofday.c:42:5: error: no previous prototype for '__vdso_clock_gettime64' [-Werror=missing-prototypes] arch/sparc/vdso/vclock_gettime.c:254:1: error: no previous prototype for '__vdso_clock_gettime' [-Werror=missing-prototypes] arch/sparc/vdso/vclock_gettime.c:282:1: error: no previous prototype for '__vdso_clock_gettime_stick' [-Werror=missing-prototypes] arch/sparc/vdso/vclock_gettime.c:307:1: error: no previous prototype for '__vdso_gettimeofday' [-Werror=missing-prototypes] arch/sparc/vdso/vclock_gettime.c:343:1: error: no previous prototype for '__vdso_gettimeofday_stick' [-Werror=missing-prototypes] Most architectures have already added workarounds for these by adding declarations somewhere, but since these are all compatible, we should really just have one copy, with an #ifdef check for the 32-bit vs 64-bit variant and use that everywhere. Unfortunately, the sparc an um versions are currently incompatible since they never added support for __vdso_clock_gettime64() in 32-bit userland. For the moment, I'm leaving this one out, as I can't easily test it and it requires a larger rework. Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
80 lines
1.9 KiB
C
80 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* MIPS64 and compat userspace implementations of gettimeofday()
|
|
* and similar.
|
|
*
|
|
* Copyright (C) 2015 Imagination Technologies
|
|
* Copyright (C) 2018 ARM Limited
|
|
*
|
|
*/
|
|
#include <linux/time.h>
|
|
#include <linux/types.h>
|
|
#include <vdso/gettime.h>
|
|
|
|
#if _MIPS_SIM != _MIPS_SIM_ABI64
|
|
int __vdso_clock_gettime(clockid_t clock,
|
|
struct old_timespec32 *ts)
|
|
{
|
|
return __cvdso_clock_gettime32(clock, ts);
|
|
}
|
|
|
|
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
|
|
|
|
/*
|
|
* This is behind the ifdef so that we don't provide the symbol when there's no
|
|
* possibility of there being a usable clocksource, because there's nothing we
|
|
* can do without it. When libc fails the symbol lookup it should fall back on
|
|
* the standard syscall path.
|
|
*/
|
|
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
|
|
struct timezone *tz)
|
|
{
|
|
return __cvdso_gettimeofday(tv, tz);
|
|
}
|
|
|
|
#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
|
|
|
|
int __vdso_clock_getres(clockid_t clock_id,
|
|
struct old_timespec32 *res)
|
|
{
|
|
return __cvdso_clock_getres_time32(clock_id, res);
|
|
}
|
|
|
|
int __vdso_clock_gettime64(clockid_t clock,
|
|
struct __kernel_timespec *ts)
|
|
{
|
|
return __cvdso_clock_gettime(clock, ts);
|
|
}
|
|
|
|
#else
|
|
|
|
int __vdso_clock_gettime(clockid_t clock,
|
|
struct __kernel_timespec *ts)
|
|
{
|
|
return __cvdso_clock_gettime(clock, ts);
|
|
}
|
|
|
|
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
|
|
|
|
/*
|
|
* This is behind the ifdef so that we don't provide the symbol when there's no
|
|
* possibility of there being a usable clocksource, because there's nothing we
|
|
* can do without it. When libc fails the symbol lookup it should fall back on
|
|
* the standard syscall path.
|
|
*/
|
|
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
|
|
struct timezone *tz)
|
|
{
|
|
return __cvdso_gettimeofday(tv, tz);
|
|
}
|
|
|
|
#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
|
|
|
|
int __vdso_clock_getres(clockid_t clock_id,
|
|
struct __kernel_timespec *res)
|
|
{
|
|
return __cvdso_clock_getres(clock_id, res);
|
|
}
|
|
|
|
#endif
|