32 bit systems using struct timespec will overflow in y2038, so as part of y2038 cleanup replace struct timespec with struct timespec64.

This patch replaces struct itimerspec with struct itimerspec64.

This patch also replaces getnstimeofday() and timespec_to_ns() with ktime_get_real_ns() to return the current time in nanoseconds.

Signed-off-by: Amitoj Kaur Chawla amitoj1606@gmail.com --- drivers/char/mmtimer.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 3d6c067..42a64e5 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -30,7 +30,8 @@ #include <linux/miscdevice.h> #include <linux/posix-timers.h> #include <linux/interrupt.h> -#include <linux/time.h> +#include <linux/ktime.h> +#include <linux/time64.h> #include <linux/math64.h> #include <linux/mutex.h> #include <linux/slab.h> @@ -468,28 +469,25 @@ static struct miscdevice mmtimer_miscdev = { &mmtimer_fops };

-static struct timespec sgi_clock_offset; -static int sgi_clock_period; - /* * Posix Timer Interface */

-static struct timespec sgi_clock_offset; +static struct timespec64 sgi_clock_offset; static int sgi_clock_period;

-static int sgi_clock_get(clockid_t clockid, struct timespec *tp) +static int sgi_clock_get(clockid_t clockid, struct timespec64 *tp) { u64 nsec;

nsec = rtc_time() * sgi_clock_period + sgi_clock_offset.tv_nsec; - *tp = ns_to_timespec(nsec); + *tp = ns_to_timespec64(nsec); tp->tv_sec += sgi_clock_offset.tv_sec; 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; @@ -657,7 +655,7 @@ static int sgi_timer_del(struct k_itimer *timr) }

/* Assumption: it_lock is already held with irq's disabled */ -static void sgi_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting) +static void sgi_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting) {

if (timr->it.mmtimer.clock == TIMER_OFF) { @@ -668,14 +666,14 @@ static void sgi_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting) return; }

- cur_setting->it_interval = ns_to_timespec(timr->it.mmtimer.incr * sgi_clock_period); - cur_setting->it_value = ns_to_timespec((timr->it.mmtimer.expires - rtc_time()) * sgi_clock_period); + cur_setting->it_interval = ns_to_timespec64(timr->it.mmtimer.incr * sgi_clock_period); + cur_setting->it_value = ns_to_timespec64((timr->it.mmtimer.expires - rtc_time()) * sgi_clock_period); }

static int sgi_timer_set(struct k_itimer *timr, int flags, - struct itimerspec * new_setting, - struct itimerspec * old_setting) + struct itimerspec64 * new_setting, + struct itimerspec64 * old_setting) { unsigned long when, period, irqflags; int err = 0; @@ -687,8 +685,8 @@ static int sgi_timer_set(struct k_itimer *timr, int flags, sgi_timer_get(timr, old_setting);

sgi_timer_del(timr); - when = timespec_to_ns(&new_setting->it_value); - period = timespec_to_ns(&new_setting->it_interval); + when = timespec64_to_ns(&new_setting->it_value); + period = timespec64_to_ns(&new_setting->it_interval);

if (when == 0) /* Clear timer */ @@ -699,11 +697,9 @@ static int sgi_timer_set(struct k_itimer *timr, int flags, return -ENOMEM;

if (flags & TIMER_ABSTIME) { - struct timespec n; unsigned long now;

- getnstimeofday(&n); - now = timespec_to_ns(&n); + now = ktime_get_real_ns(); if (when > now) when -= now; else @@ -765,7 +761,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;