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

Commit 0fe6afe3 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Thomas Gleixner
Browse files

time: Change k_clock clock_set() to use timespec64 



struct timespec is not y2038 safe on 32 bit machines.  Replace uses of
struct timespec with struct timespec64 in the kernel.

The syscall interfaces themselves will be changed in a separate series.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Cc: y2038@lists.linaro.org
Cc: john.stultz@linaro.org
Cc: arnd@arndb.de
Link: http://lkml.kernel.org/r/1490555058-4603-6-git-send-email-deepa.kernel@gmail.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d2e3e0ca

drivers/char/mmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int sgi_clock_get(clockid_t clockid, struct timespec64 *tp) 
	return 0;

};



static int sgi_clock_set(const clockid_t clockid, const struct timespec *tp)

static int sgi_clock_set(const clockid_t clockid, const struct timespec64 *tp)

{



	u64 nsec;

include/linux/posix-timers.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct k_itimer { 
struct k_clock {

	int (*clock_getres) (const clockid_t which_clock, struct timespec64 *tp);

	int (*clock_set) (const clockid_t which_clock,

			  const struct timespec *tp);

			  const struct timespec64 *tp);

	int (*clock_get) (const clockid_t which_clock, struct timespec64 *tp);

	int (*clock_adj) (const clockid_t which_clock, struct timex *tx);

	int (*timer_create) (struct k_itimer *timer);

kernel/time/posix-clock.c

+2 −3
Original line number Diff line number Diff line
@@ -335,9 +335,8 @@ static int pc_clock_getres(clockid_t id, struct timespec64 *ts) 
	return err;

}



static int pc_clock_settime(clockid_t id, const struct timespec *ts)

static int pc_clock_settime(clockid_t id, const struct timespec64 *ts)

{

	struct timespec64 ts64 = timespec_to_timespec64(*ts);

	struct posix_clock_desc cd;

	int err;
@@ -351,7 +350,7 @@ static int pc_clock_settime(clockid_t id, const struct timespec *ts) 
	}



	if (cd.clk->ops.clock_settime)

		err = cd.clk->ops.clock_settime(cd.clk, &ts64);

		err = cd.clk->ops.clock_settime(cd.clk, ts);

	else

		err = -EOPNOTSUPP;

out:

kernel/time/posix-cpu-timers.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp) 
}



static int

posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp)

posix_cpu_clock_set(const clockid_t which_clock, const struct timespec64 *tp)

{

	/*

	 * You can never reset a CPU clock, but we check for other errors

kernel/time/posix-timers.c

+5 −6
Original line number Diff line number Diff line
@@ -212,12 +212,9 @@ static int posix_clock_realtime_get(clockid_t which_clock, struct timespec64 *tp 


/* Set clock_realtime */

static int posix_clock_realtime_set(const clockid_t which_clock,

				    const struct timespec *tp)

				    const struct timespec64 *tp)

{

	struct timespec64 tp64;



	tp64 = timespec_to_timespec64(*tp);

	return do_sys_settimeofday64(&tp64, NULL);

	return do_sys_settimeofday64(tp, NULL);

}



static int posix_clock_realtime_adj(const clockid_t which_clock,
@@ -1017,6 +1014,7 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, 
		const struct timespec __user *, tp)

{

	struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec64 new_tp64;

	struct timespec new_tp;



	if (!kc || !kc->clock_set)
@@ -1024,8 +1022,9 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, 


	if (copy_from_user(&new_tp, tp, sizeof (*tp)))

		return -EFAULT;

	new_tp64 = timespec_to_timespec64(new_tp);



	return kc->clock_set(which_clock, &new_tp);

	return kc->clock_set(which_clock, &new_tp64);

}



SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,