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

time: Change k_clock clock_getres() 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.

The clock_getres() interface has also been changed to use timespec64 even
though this particular interface is not affected by the y2038 problem. This
helps verification for internal kernel code for y2038 readiness by getting
rid of time_t/ timeval/ timespec completely.

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-5-git-send-email-deepa.kernel@gmail.com


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

drivers/char/mmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int sgi_timer_set(struct k_itimer *timr, int flags, 
	return err;

}



static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp)

static int sgi_clock_getres(const clockid_t which_clock, struct timespec64 *tp)

{

	tp->tv_sec = 0;

	tp->tv_nsec = sgi_clock_period;

include/linux/posix-timers.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct k_itimer { 
};



struct k_clock {

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

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

	int (*clock_set) (const clockid_t which_clock,

			  const struct timespec *tp);

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

kernel/time/alarmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm, 
 *

 * Returns the granularity of underlying alarm base clock

 */

static int alarm_clock_getres(const clockid_t which_clock, struct timespec *tp)

static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp)

{

	if (!alarmtimer_get_rtcdev())

		return -EINVAL;

kernel/time/posix-clock.c

+3 −6
Original line number Diff line number Diff line
@@ -316,20 +316,17 @@ static int pc_clock_gettime(clockid_t id, struct timespec64 *ts) 
	return err;

}



static int pc_clock_getres(clockid_t id, struct timespec *ts)

static int pc_clock_getres(clockid_t id, struct timespec64 *ts)

{

	struct posix_clock_desc cd;

	struct timespec64 ts64;

	int err;



	err = get_clock_desc(id, &cd);

	if (err)

		return err;



	if (cd.clk->ops.clock_getres) {

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

		*ts = timespec64_to_timespec(ts64);

	}

	if (cd.clk->ops.clock_getres)

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

	else

		err = -EOPNOTSUPP;

kernel/time/posix-cpu-timers.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static inline u64 virt_ticks(struct task_struct *p) 
}



static int

posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp)

posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp)

{

	int error = check_clock(which_clock);

	if (!error) {
@@ -1369,7 +1369,7 @@ static long posix_cpu_nsleep_restart(struct restart_block *restart_block) 
#define THREAD_CLOCK	MAKE_THREAD_CPUCLOCK(0, CPUCLOCK_SCHED)



static int process_cpu_clock_getres(const clockid_t which_clock,

				    struct timespec *tp)

				    struct timespec64 *tp)

{

	return posix_cpu_clock_getres(PROCESS_CLOCK, tp);

}
@@ -1394,7 +1394,7 @@ static long process_cpu_nsleep_restart(struct restart_block *restart_block) 
	return -EINVAL;

}

static int thread_cpu_clock_getres(const clockid_t which_clock,

				   struct timespec *tp)

				   struct timespec64 *tp)

{

	return posix_cpu_clock_getres(THREAD_CLOCK, tp);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE