In order to simplify next step which moves fallback call at arch
level, ensure all arches have a 32bit fallback instead of handling
the lack of 32bit fallback in the common code based
on VDSO_HAS_32BIT_FALLBACK
Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
---
arch/arm/include/asm/vdso/gettimeofday.h | 26 +++++++++++++++++++++
arch/arm64/include/asm/vdso/compat_gettimeofday.h | 2 --
arch/arm64/include/asm/vdso/gettimeofday.h | 26 +++++++++++++++++++++
arch/mips/include/asm/vdso/gettimeofday.h | 28 +++++++++++++++++++++--
arch/x86/include/asm/vdso/gettimeofday.h | 28 +++++++++++++++++++++--
lib/vdso/gettimeofday.c | 10 --------
6 files changed, 104 insertions(+), 16 deletions(-)
diff --git a/arch/arm/include/asm/vdso/gettimeofday.h
b/arch/arm/include/asm/vdso/gettimeofday.h
index 0ad2429c324f..55f8ad6e7777 100644
--- a/arch/arm/include/asm/vdso/gettimeofday.h
+++ b/arch/arm/include/asm/vdso/gettimeofday.h
@@ -70,6 +70,32 @@ static __always_inline int clock_getres_fallback(
return ret;
}
+static __always_inline
+long clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_gettime_fallback(clock, &ts);
+
+ if (likely(!ret)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
+static __always_inline
+long clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_getres_fallback(clock, &ts);
+
+ if (likely(!ret && _ts)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
static __always_inline u64 __arch_get_hw_counter(int clock_mode)
{
#ifdef CONFIG_ARM_ARCH_TIMER
diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h
b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
index c50ee1b7d5cd..bab700e37a03 100644
--- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
@@ -16,8 +16,6 @@
#define VDSO_HAS_CLOCK_GETRES 1
-#define VDSO_HAS_32BIT_FALLBACK 1
-
static __always_inline
int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
struct timezone *_tz)
diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h
b/arch/arm64/include/asm/vdso/gettimeofday.h
index b08f476b72b4..c41c86a07423 100644
--- a/arch/arm64/include/asm/vdso/gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/gettimeofday.h
@@ -66,6 +66,32 @@ int clock_getres_fallback(clockid_t _clkid, struct
__kernel_timespec *_ts)
return ret;
}
+static __always_inline
+long clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_gettime_fallback(clock, &ts);
+
+ if (likely(!ret)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
+static __always_inline
+long clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_getres_fallback(clock, &ts);
+
+ if (likely(!ret && _ts)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
static __always_inline u64 __arch_get_hw_counter(s32 clock_mode)
{
u64 res;
diff --git a/arch/mips/include/asm/vdso/gettimeofday.h
b/arch/mips/include/asm/vdso/gettimeofday.h
index b08825531e9f..60608e930a5c 100644
--- a/arch/mips/include/asm/vdso/gettimeofday.h
+++ b/arch/mips/include/asm/vdso/gettimeofday.h
@@ -109,8 +109,6 @@ static __always_inline int clock_getres_fallback(
#if _MIPS_SIM != _MIPS_SIM_ABI64
-#define VDSO_HAS_32BIT_FALLBACK 1
-
static __always_inline long clock_gettime32_fallback(
clockid_t _clkid,
struct old_timespec32 *_ts)
@@ -150,6 +148,32 @@ static __always_inline int clock_getres32_fallback(
return error ? -ret : ret;
}
+#else
+static __always_inline
+long clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_gettime_fallback(clock, &ts);
+
+ if (likely(!ret)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
+static __always_inline
+long clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_getres_fallback(clock, &ts);
+
+ if (likely(!ret && _ts)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
#endif
#ifdef CONFIG_CSRC_R4K
diff --git a/arch/x86/include/asm/vdso/gettimeofday.h
b/arch/x86/include/asm/vdso/gettimeofday.h
index e9ee139cf29e..e1e16c2fdba0 100644
--- a/arch/x86/include/asm/vdso/gettimeofday.h
+++ b/arch/x86/include/asm/vdso/gettimeofday.h
@@ -94,9 +94,33 @@ long clock_getres_fallback(clockid_t _clkid, struct
__kernel_timespec *_ts)
return ret;
}
-#else
+static __always_inline
+long clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_gettime_fallback(clock, &ts);
-#define VDSO_HAS_32BIT_FALLBACK 1
+ if (likely(!ret)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
+static __always_inline
+long clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
+{
+ struct __kernel_timespec ts;
+ int ret = clock_getres_fallback(clock, &ts);
+
+ if (likely(!ret && _ts)) {
+ _ts->tv_sec = ts.tv_sec;
+ _ts->tv_nsec = ts.tv_nsec;
+ }
+ return ret;
+}
+
+#else
static __always_inline
long clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index 9ecfd3b547ba..59189ed49352 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -125,13 +125,8 @@ __cvdso_clock_gettime32(clockid_t clock, struct
old_timespec32 *res)
ret = __cvdso_clock_gettime_common(clock, &ts);
-#ifdef VDSO_HAS_32BIT_FALLBACK
if (unlikely(ret))
return clock_gettime32_fallback(clock, res);
-#else
- if (unlikely(ret))
- ret = clock_gettime_fallback(clock, &ts);
-#endif
if (likely(!ret)) {
res->tv_sec = ts.tv_sec;
@@ -238,13 +233,8 @@ __cvdso_clock_getres_time32(clockid_t clock, struct
old_timespec32 *res)
ret = __cvdso_clock_getres_common(clock, &ts);
-#ifdef VDSO_HAS_32BIT_FALLBACK
if (unlikely(ret))
return clock_getres32_fallback(clock, res);
-#else
- if (unlikely(ret))
- ret = clock_getres_fallback(clock, &ts);
-#endif
if (likely(!ret && res)) {
res->tv_sec = ts.tv_sec;
--
2.13.3
