Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d5b8413 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Arnd Bergmann
Browse files

time: Change types to new y2038 safe __kernel_* types 



Change over clock_settime, clock_gettime and clock_getres
syscalls to use __kernel_timespec times. This will enable
changing over of these syscalls to use new y2038 safe syscalls
when the architectures define the CONFIG_64BIT_TIME.

Cc: linux-api@vger.kernel.org
Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ea2ce8f3

include/linux/syscalls.h

+3 −3
Original line number Diff line number Diff line
@@ -567,11 +567,11 @@ asmlinkage long sys_timer_settime(timer_t timer_id, int flags, 
				struct itimerspec __user *old_setting);

asmlinkage long sys_timer_delete(timer_t timer_id);

asmlinkage long sys_clock_settime(clockid_t which_clock,

				const struct timespec __user *tp);

				const struct __kernel_timespec __user *tp);

asmlinkage long sys_clock_gettime(clockid_t which_clock,

				struct timespec __user *tp);

				struct __kernel_timespec __user *tp);

asmlinkage long sys_clock_getres(clockid_t which_clock,

				struct timespec __user *tp);

				struct __kernel_timespec __user *tp);

asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,

				const struct timespec __user *rqtp,

				struct timespec __user *rmtp);

kernel/time/posix-stubs.c

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ SYS_NI(alarm); 
 */



SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,

		const struct timespec __user *, tp)

		const struct __kernel_timespec __user *, tp)

{

	struct timespec64 new_tp;
@@ -92,7 +92,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp) 
	return 0;

}

SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,

		struct timespec __user *, tp)

		struct __kernel_timespec __user *, tp)

{

	int ret;

	struct timespec64 kernel_tp;
@@ -106,7 +106,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock, 
	return 0;

}



SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __user *, tp)

SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_timespec __user *, tp)

{

	struct timespec64 rtn_tp = {

		.tv_sec = 0,

kernel/time/posix-timers.c

+3 −3
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ void exit_itimers(struct signal_struct *sig) 
}



SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,

		const struct timespec __user *, tp)

		const struct __kernel_timespec __user *, tp)

{

	const struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec64 new_tp;
@@ -1056,7 +1056,7 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, 
}



SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,

		struct timespec __user *,tp)

		struct __kernel_timespec __user *, tp)

{

	const struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec64 kernel_tp;
@@ -1097,7 +1097,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock, 
}



SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,

		struct timespec __user *, tp)

		struct __kernel_timespec __user *, tp)

{

	const struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec64 rtn_tp;