Commit 21346564 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 82210fc7

arch/x86/entry/vdso/vclock_gettime.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "../../../../lib/vdso/gettimeofday.c"



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)

{
@@ -25,12 +25,12 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) 
int gettimeofday(struct __kernel_old_timeval *, struct timezone *)

	__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);

}



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)

arch/x86/entry/vsyscall/vsyscall_64.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ bool emulate_vsyscall(unsigned long error_code, 
		break;



	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;

			goto check_fault;

		}

arch/x86/um/vdso/um_vdso.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) 
int gettimeofday(struct __kernel_old_timeval *, struct timezone *)

	__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;
@@ -47,7 +47,7 @@ time_t __vdso_time(time_t *t) 


	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

__vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)

lib/vdso/gettimeofday.c

+2 −2
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) 
}



#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();

	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)

		*time = t;

CRA Git | Maintained and supported by SUSTech CRA and CCSE