From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753229AbbDCIUH (ORCPT ); Fri, 3 Apr 2015 04:20:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44729 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbbDCIUB (ORCPT ); Fri, 3 Apr 2015 04:20:01 -0400 Date: Fri, 3 Apr 2015 01:19:22 -0700 From: tip-bot for Xunlei Pang Message-ID: Cc: peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, a.zummo@towertech.it, rth@twiddle.net, pang.xunlei@linaro.org, hpa@zytor.com, linux-kernel@vger.kernel.org, john.stultz@linaro.org Reply-To: peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, a.zummo@towertech.it, rth@twiddle.net, pang.xunlei@linaro.org, hpa@zytor.com, linux-kernel@vger.kernel.org, john.stultz@linaro.org In-Reply-To: <1427945681-29972-15-git-send-email-john.stultz@linaro.org> References: <1427945681-29972-15-git-send-email-john.stultz@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] alpha, rtc: Change to use rtc_class_ops' s set_mmss64() Git-Commit-ID: a5312f56e0a67deed5c7d1191140e00b6d367e01 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a5312f56e0a67deed5c7d1191140e00b6d367e01 Gitweb: http://git.kernel.org/tip/a5312f56e0a67deed5c7d1191140e00b6d367e01 Author: Xunlei Pang AuthorDate: Wed, 1 Apr 2015 20:34:34 -0700 Committer: Ingo Molnar CommitDate: Fri, 3 Apr 2015 08:18:30 +0200 alpha, rtc: Change to use rtc_class_ops's set_mmss64() Change alpha_rtc_set_mmss() and remote_set_mmss() to use rtc_class_ops's set_mmss64(), to be y2038 safe. Signed-off-by: Xunlei Pang Signed-off-by: John Stultz Acked-by: Alessandro Zummo Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Richard Henderson Link: http://lkml.kernel.org/r/1427945681-29972-15-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar --- arch/alpha/kernel/rtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c index c8d284d..f535a3f 100644 --- a/arch/alpha/kernel/rtc.c +++ b/arch/alpha/kernel/rtc.c @@ -116,7 +116,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm) } static int -alpha_rtc_set_mmss(struct device *dev, unsigned long nowtime) +alpha_rtc_set_mmss(struct device *dev, time64_t nowtime) { int retval = 0; int real_seconds, real_minutes, cmos_minutes; @@ -211,7 +211,7 @@ alpha_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) static const struct rtc_class_ops alpha_rtc_ops = { .read_time = alpha_rtc_read_time, .set_time = alpha_rtc_set_time, - .set_mmss = alpha_rtc_set_mmss, + .set_mmss64 = alpha_rtc_set_mmss, .ioctl = alpha_rtc_ioctl, }; @@ -276,7 +276,7 @@ do_remote_mmss(void *data) } static int -remote_set_mmss(struct device *dev, unsigned long now) +remote_set_mmss(struct device *dev, time64_t now) { union remote_data x; if (smp_processor_id() != boot_cpuid) { @@ -290,7 +290,7 @@ remote_set_mmss(struct device *dev, unsigned long now) static const struct rtc_class_ops remote_rtc_ops = { .read_time = remote_read_time, .set_time = remote_set_time, - .set_mmss = remote_set_mmss, + .set_mmss64 = remote_set_mmss, .ioctl = alpha_rtc_ioctl, }; #endif