From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964871AbbGZBzb (ORCPT ); Sat, 25 Jul 2015 21:55:31 -0400 Received: from m50-110.126.com ([123.125.50.110]:55222 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755078AbbGZBza (ORCPT ); Sat, 25 Jul 2015 21:55:30 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , David Howells , Koichi Yasutake , linux-am33-list@redhat.com, Xunlei Pang , John Stultz , Arnd Bergmann Subject: [PATCH v2 2/2] mn10300: time: Provide 64-bit persistent clock time Date: Sun, 26 Jul 2015 09:53:53 +0800 Message-Id: <1437875633-5715-2-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437875633-5715-1-git-send-email-xlpang@126.com> References: <1437875633-5715-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jdKowAAHrCTXPbRVwMbaAQ--.5958S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7CryDZw47tr18ZF1UXr15XFb_yoW8Kr45p3 yIk3Z8Jr4UtFW7ZF92y34Duw1Yg3s8tF42qa4fta4Fywn7trnrKFy0v342vr9FgFyfZa10 9a1xGFnIvw4kCwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jJqXdUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbi7wBDv1UwzFDCfgAAsW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang As part of addressing the "y2038 problem" for in-kernel uses, convert update_persistent_clock() to update_persistent_clock64(), read_persistent_clock() to read_persistent_clock64() using timespec64 for MN10300. Cc: John Stultz Cc: Arnd Bergmann Signed-off-by: Xunlei Pang --- arch/mn10300/kernel/rtc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c index 48d7058..038ae16 100644 --- a/arch/mn10300/kernel/rtc.c +++ b/arch/mn10300/kernel/rtc.c @@ -23,19 +23,19 @@ EXPORT_SYMBOL(rtc_lock); /* * Read the current RTC time */ -void read_persistent_clock(struct timespec *ts) +void read_persistent_clock64(struct timespec64 *ts) { struct rtc_time tm; get_rtc_time(&tm); ts->tv_nsec = 0; - ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday, + ts->tv_sec = mktime64(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); /* if rtc is way off in the past, set something reasonable */ if (ts->tv_sec < 0) - ts->tv_sec = mktime(2009, 1, 1, 12, 0, 0); + ts->tv_sec = mktime64(2009, 1, 1, 12, 0, 0); } /* @@ -48,7 +48,7 @@ void read_persistent_clock(struct timespec *ts) * BUG: This routine does not handle hour overflow properly; it just * sets the minutes. Usually you'll only notice that after reboot! */ -static int set_rtc_mmss(unsigned long nowtime) +static int set_rtc_mmss(time64_t nowtime) { unsigned char save_control, save_freq_select; int retval = 0; @@ -74,8 +74,7 @@ static int set_rtc_mmss(unsigned long nowtime) * messing with unknown time zones but requires your * RTC not to be off by more than 15 minutes */ - real_seconds = nowtime % 60; - real_minutes = nowtime / 60; + real_minutes = div_s64_rem(nowtime, 60, &real_seconds); if (((abs(real_minutes - cmos_minutes) + 15) / 30) & 1) /* correct for half hour time zone */ real_minutes += 30; @@ -109,7 +108,7 @@ static int set_rtc_mmss(unsigned long nowtime) return retval; } -int update_persistent_clock(struct timespec now) +int update_persistent_clock64(struct timespec64 now) { return set_rtc_mmss(now.tv_sec); } -- 1.9.1