time: Use do_settimeofday64() internally (4eb1bca1) · Commits · 戴 / test

do_settimeofday() is a wrapper around do_settimeofday64(), so that function can be called directly. The wrapper can be removed once the last user is gone. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Cc: y2038@lists.linaro.org Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Deepa Dinamani <deepa.kernel@gmail.com> Link: https://lkml.kernel.org/r/20171013183452.3635956-1-arnd@arndb.de

kernel/time/time.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ SYSCALL_DEFINE1(time, time_t __user *, tloc)

		SYSCALL_DEFINE1(stime, time_t __user *, tptr)
		{
		struct timespec tv;
		struct timespec64 tv;
		int err;

		if (get_user(tv.tv_sec, tptr))
		@@ -90,11 +90,11 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr)

		tv.tv_nsec = 0;

		err = security_settime(&tv, NULL);
		err = security_settime64(&tv, NULL);
		if (err)
		return err;

		do_settimeofday(&tv);
		do_settimeofday64(&tv);
		return 0;
		}

		@@ -122,7 +122,7 @@ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc)

		COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr)
		{
		struct timespec tv;
		struct timespec64 tv;
		int err;

		if (get_user(tv.tv_sec, tptr))
		@@ -130,11 +130,11 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr)

		tv.tv_nsec = 0;

		err = security_settime(&tv, NULL);
		err = security_settime64(&tv, NULL);
		if (err)
		return err;

		do_settimeofday(&tv);
		do_settimeofday64(&tv);
		return 0;
		}

Admin message