UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

y2038: vdso: change time_t to __kernel_old_time_t 

Only x86 uses the 'time' syscall in vdso, so change that to
__kernel_old_time_t as a preparation for removing 'time_t' and
'__kernel_time_t' later.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-11-05 11:10:01 +01:00
parent 82210fc778
commit 21346564cc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/entry/vdso/vclock_gettime.c
View File

@ -15,7 +15,7 @@
#include "../../../../lib/vdso/gettimeofday.c" #include "../../../../lib/vdso/gettimeofday.c"
extern int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz); extern int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz);
extern time_t __vdso_time(time_t *t); extern __kernel_old_time_t __vdso_time(__kernel_old_time_t *t);
int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
{ {
@ -25,12 +25,12 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
int gettimeofday(struct __kernel_old_timeval *, struct timezone *) int gettimeofday(struct __kernel_old_timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday"))); __attribute__((weak, alias("__vdso_gettimeofday")));
time_t __vdso_time(time_t *t) __kernel_old_time_t __vdso_time(__kernel_old_time_t *t)
{ {
return __cvdso_time(t); return __cvdso_time(t);
} }
time_t time(time_t *t) __attribute__((weak, alias("__vdso_time"))); __kernel_old_time_t time(__kernel_old_time_t *t) __attribute__((weak, alias("__vdso_time")));
#if defined(CONFIG_X86_64) && !defined(BUILD_VDSO32_64) #if defined(CONFIG_X86_64) && !defined(BUILD_VDSO32_64)

2
arch/x86/entry/vsyscall/vsyscall_64.c
View File

@ -194,7 +194,7 @@ bool emulate_vsyscall(unsigned long error_code,
break; break;
case 1: case 1:
if (!write_ok_or_segv(regs->di, sizeof(time_t))) { if (!write_ok_or_segv(regs->di, sizeof(__kernel_old_time_t))) {
ret = -EFAULT; ret = -EFAULT;
goto check_fault; goto check_fault;
} }

4
arch/x86/um/vdso/um_vdso.c
View File

@ -37,7 +37,7 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
int gettimeofday(struct __kernel_old_timeval *, struct timezone *) int gettimeofday(struct __kernel_old_timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday"))); __attribute__((weak, alias("__vdso_gettimeofday")));
time_t __vdso_time(time_t *t) __kernel_old_time_t __vdso_time(__kernel_old_time_t *t)
{ {
long secs; long secs;
@ -47,7 +47,7 @@ time_t __vdso_time(time_t *t)
return secs; return secs;
} }
time_t time(time_t *t) __attribute__((weak, alias("__vdso_time"))); __kernel_old_time_t time(__kernel_old_time_t *t) __attribute__((weak, alias("__vdso_time")));
long long
__vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused) __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)

4
lib/vdso/gettimeofday.c
View File

@ -164,10 +164,10 @@ __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
} }
#ifdef VDSO_HAS_TIME #ifdef VDSO_HAS_TIME
static __maybe_unused time_t __cvdso_time(time_t *time) static __maybe_unused __kernel_old_time_t __cvdso_time(__kernel_old_time_t *time)
{ {
const struct vdso_data *vd = __arch_get_vdso_data(); const struct vdso_data *vd = __arch_get_vdso_data();
time_t t = READ_ONCE(vd[CS_HRES_COARSE].basetime[CLOCK_REALTIME].sec); __kernel_old_time_t t = READ_ONCE(vd[CS_HRES_COARSE].basetime[CLOCK_REALTIME].sec);
if (time) if (time)
*time = t; *time = t;