Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer core updates from Thomas Gleixner: "The time(r) departement provides: - more infrastructure work on the year 2038 issue - a few fixes in the Armada SoC timers - the usual pile of fixlets and improvements" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: armada-370-xp: Use the reference clock on A375 SoC watchdog: orion: Use the reference clock on Armada 375 SoC clocksource: armada-370-xp: Add missing clock enable time: Fix sign bug in NTP mult overflow warning time: Remove timekeeping_inject_sleeptime() rtc: Update suspend/resume timing to use 64bit time rtc/lib: Provide y2038 safe rtc_tm_to_time()/rtc_time_to_tm() replacement time: Fixup comments to reflect usage of timespec64 time: Expose get_monotonic_coarse64() for in-kernel uses time: Expose getrawmonotonic64 for in-kernel uses time: Provide y2038 safe mktime() replacement time: Provide y2038 safe timekeeping_inject_sleeptime() replacement time: Provide y2038 safe do_settimeofday() replacement time: Complete NTP adjustment threshold judging conditions time: Avoid possible NTP adjustment mult overflow. time: Rename udelay_test.c to test_udelay.c clocksource: sirf: Remove hard-coded clock rate
author: Linus Torvalds <torvalds@linux-foundation.org> 2014-12-10 11:18:32 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2014-12-10 11:18:32 -0500
commit: a157508c9790ccd1c8b5c6a828d6ba85bbe95aaa (patch)
tree: 84fc815aac23bb44747e5bdad0559e7383d6f1e6 /drivers/rtc
parent: 86c6a2fddf0b89b494c7616f2c06cf915c4bff01 (diff)
parent: 89de77a8c557f14d2713a1f43fbc33980e639b98 (diff)
2 files changed, 35 insertions, 33 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 38e26be705be..472a5adc4642 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -45,14 +45,14 @@ int rtc_hctosys_ret = -ENODEV;
 * system's wall clock; restore it on resume().
 */
-static struct timespec old_rtc, old_system, old_delta;
+static struct timespec64 old_rtc, old_system, old_delta;
 static int rtc_suspend(struct device *dev)
 {
        struct rtc_device       *rtc = to_rtc_device(dev);
        struct rtc_time         tm;
-        struct timespec         delta, delta_delta;
+        struct timespec64       delta, delta_delta;
        int err;
        if (has_persistent_clock())
@@ -68,8 +68,8 @@ static int rtc_suspend(struct device *dev)
                return 0;
        }
-        getnstimeofday(&old_system);
+        getnstimeofday64(&old_system);
-        rtc_tm_to_time(&tm, &old_rtc.tv_sec);
+        old_rtc.tv_sec = rtc_tm_to_time64(&tm);
        /*
@@ -78,8 +78,8 @@ static int rtc_suspend(struct device *dev)
         * try to compensate so the difference in system time
         * and rtc time stays close to constant.
         */
-        delta = timespec_sub(old_system, old_rtc);
+        delta = timespec64_sub(old_system, old_rtc);
-        delta_delta = timespec_sub(delta, old_delta);
+        delta_delta = timespec64_sub(delta, old_delta);
        if (delta_delta.tv_sec < -2 || delta_delta.tv_sec >= 2) {
                /*
                 * if delta_delta is too large, assume time correction
@@ -88,7 +88,7 @@ static int rtc_suspend(struct device *dev)
                old_delta = delta;
        } else {
                /* Otherwise try to adjust old_system to compensate */
-                old_system = timespec_sub(old_system, delta_delta);
+                old_system = timespec64_sub(old_system, delta_delta);
        }
        return 0;
@@ -98,8 +98,8 @@ static int rtc_resume(struct device *dev)
 {
        struct rtc_device       *rtc = to_rtc_device(dev);
        struct rtc_time         tm;
-        struct timespec         new_system, new_rtc;
+        struct timespec64       new_system, new_rtc;
-        struct timespec         sleep_time;
+        struct timespec64       sleep_time;
        int err;
        if (has_persistent_clock())
@@ -110,7 +110,7 @@ static int rtc_resume(struct device *dev)
                return 0;
        /* snapshot the current rtc and system time at resume */
-        getnstimeofday(&new_system);
+        getnstimeofday64(&new_system);
        err = rtc_read_time(rtc, &tm);
        if (err < 0) {
                pr_debug("%s:  fail to read rtc time\n", dev_name(&rtc->dev));
@@ -121,7 +121,7 @@ static int rtc_resume(struct device *dev)
                pr_debug("%s:  bogus resume time\n", dev_name(&rtc->dev));
                return 0;
        }
-        rtc_tm_to_time(&tm, &new_rtc.tv_sec);
+        new_rtc.tv_sec = rtc_tm_to_time64(&tm);
        new_rtc.tv_nsec = 0;
        if (new_rtc.tv_sec < old_rtc.tv_sec) {
@@ -130,7 +130,7 @@ static int rtc_resume(struct device *dev)
        }
        /* calculate the RTC time delta (sleep time)*/
-        sleep_time = timespec_sub(new_rtc, old_rtc);
+        sleep_time = timespec64_sub(new_rtc, old_rtc);
        /*
         * Since these RTC suspend/resume handlers are not called
@@ -139,11 +139,11 @@ static int rtc_resume(struct device *dev)
         * so subtract kernel run-time between rtc_suspend to rtc_resume
         * to keep things accurate.
         */
-        sleep_time = timespec_sub(sleep_time,
+        sleep_time = timespec64_sub(sleep_time,
-                        timespec_sub(new_system, old_system));
+                        timespec64_sub(new_system, old_system));
        if (sleep_time.tv_sec >= 0)
-                timekeeping_inject_sleeptime(&sleep_time);
+                timekeeping_inject_sleeptime64(&sleep_time);
        rtc_hctosys_ret = 0;
        return 0;
 }
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index c4cf05731118..e6bfb9c42a10 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -45,16 +45,20 @@ int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)
 }
 EXPORT_SYMBOL(rtc_year_days);
 /*
+ * rtc_time_to_tm64 - Converts time64_t to rtc_time.
 * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
 */
-void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
+void rtc_time64_to_tm(time64_t time, struct rtc_time *tm)
 {
        unsigned int month, year;
+        unsigned long secs;
        int days;
-        days = time / 86400;
+        /* time must be positive */
-        time -= (unsigned int) days * 86400;
+        days = div_s64(time, 86400);
+        secs = time - (unsigned int) days * 86400;
        /* day of the week, 1970-01-01 was a Thursday */
        tm->tm_wday = (days + 4) % 7;
@@ -81,14 +85,14 @@ void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
        tm->tm_mon = month;
        tm->tm_mday = days + 1;
-        tm->tm_hour = time / 3600;
+        tm->tm_hour = secs / 3600;
-        time -= tm->tm_hour * 3600;
+        secs -= tm->tm_hour * 3600;
-        tm->tm_min = time / 60;
+        tm->tm_min = secs / 60;
-        tm->tm_sec = time - tm->tm_min * 60;
+        tm->tm_sec = secs - tm->tm_min * 60;
        tm->tm_isdst = 0;
 }
-EXPORT_SYMBOL(rtc_time_to_tm);
+EXPORT_SYMBOL(rtc_time64_to_tm);
 /*
 * Does the rtc_time represent a valid date/time?
@@ -109,24 +113,22 @@ int rtc_valid_tm(struct rtc_time *tm)
 EXPORT_SYMBOL(rtc_valid_tm);
 /*
+ * rtc_tm_to_time64 - Converts rtc_time to time64_t.
 * Convert Gregorian date to seconds since 01-01-1970 00:00:00.
 */
-int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time)
+time64_t rtc_tm_to_time64(struct rtc_time *tm)
 {
-        *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+        return mktime64(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
                        tm->tm_hour, tm->tm_min, tm->tm_sec);
-        return 0;
 }
-EXPORT_SYMBOL(rtc_tm_to_time);
+EXPORT_SYMBOL(rtc_tm_to_time64);
 /*
 * Convert rtc_time to ktime
 */
 ktime_t rtc_tm_to_ktime(struct rtc_time tm)
 {
-        time_t time;
+        return ktime_set(rtc_tm_to_time64(&tm), 0);
-        rtc_tm_to_time(&tm, &time);
-        return ktime_set(time, 0);
 }
 EXPORT_SYMBOL_GPL(rtc_tm_to_ktime);
@@ -135,14 +137,14 @@ EXPORT_SYMBOL_GPL(rtc_tm_to_ktime);
 */
 struct rtc_time rtc_ktime_to_tm(ktime_t kt)
 {
-        struct timespec ts;
+        struct timespec64 ts;
        struct rtc_time ret;
-        ts = ktime_to_timespec(kt);
+        ts = ktime_to_timespec64(kt);
        /* Round up any ns */
        if (ts.tv_nsec)
                ts.tv_sec++;
-        rtc_time_to_tm(ts.tv_sec, &ret);
+        rtc_time64_to_tm(ts.tv_sec, &ret);
        return ret;
 }
 EXPORT_SYMBOL_GPL(rtc_ktime_to_tm);
author	Linus Torvalds <torvalds@linux-foundation.org>	2014-12-10 11:18:32 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2014-12-10 11:18:32 -0500
commit	a157508c9790ccd1c8b5c6a828d6ba85bbe95aaa (patch)
tree	84fc815aac23bb44747e5bdad0559e7383d6f1e6 /drivers/rtc
parent	86c6a2fddf0b89b494c7616f2c06cf915c4bff01 (diff)
parent	89de77a8c557f14d2713a1f43fbc33980e639b98 (diff)