diff options
author | Xunlei Pang <pang.xunlei@linaro.org> | 2015-04-01 23:34:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-03 02:18:30 -0400 |
commit | a5312f56e0a67deed5c7d1191140e00b6d367e01 (patch) | |
tree | abf41a80682cc4ab0277325b8104a2d442e462e2 /arch/alpha | |
parent | 933623c38f014b10db564f0ec44f9db64a5ced84 (diff) |
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 <pang.xunlei@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Henderson <rth@twiddle.net>
Link: http://lkml.kernel.org/r/1427945681-29972-15-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/rtc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c index c8d284d8521f..f535a3fd0f60 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) | |||
116 | } | 116 | } |
117 | 117 | ||
118 | static int | 118 | static int |
119 | alpha_rtc_set_mmss(struct device *dev, unsigned long nowtime) | 119 | alpha_rtc_set_mmss(struct device *dev, time64_t nowtime) |
120 | { | 120 | { |
121 | int retval = 0; | 121 | int retval = 0; |
122 | int real_seconds, real_minutes, cmos_minutes; | 122 | int real_seconds, real_minutes, cmos_minutes; |
@@ -211,7 +211,7 @@ alpha_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) | |||
211 | static const struct rtc_class_ops alpha_rtc_ops = { | 211 | static const struct rtc_class_ops alpha_rtc_ops = { |
212 | .read_time = alpha_rtc_read_time, | 212 | .read_time = alpha_rtc_read_time, |
213 | .set_time = alpha_rtc_set_time, | 213 | .set_time = alpha_rtc_set_time, |
214 | .set_mmss = alpha_rtc_set_mmss, | 214 | .set_mmss64 = alpha_rtc_set_mmss, |
215 | .ioctl = alpha_rtc_ioctl, | 215 | .ioctl = alpha_rtc_ioctl, |
216 | }; | 216 | }; |
217 | 217 | ||
@@ -276,7 +276,7 @@ do_remote_mmss(void *data) | |||
276 | } | 276 | } |
277 | 277 | ||
278 | static int | 278 | static int |
279 | remote_set_mmss(struct device *dev, unsigned long now) | 279 | remote_set_mmss(struct device *dev, time64_t now) |
280 | { | 280 | { |
281 | union remote_data x; | 281 | union remote_data x; |
282 | if (smp_processor_id() != boot_cpuid) { | 282 | if (smp_processor_id() != boot_cpuid) { |
@@ -290,7 +290,7 @@ remote_set_mmss(struct device *dev, unsigned long now) | |||
290 | static const struct rtc_class_ops remote_rtc_ops = { | 290 | static const struct rtc_class_ops remote_rtc_ops = { |
291 | .read_time = remote_read_time, | 291 | .read_time = remote_read_time, |
292 | .set_time = remote_set_time, | 292 | .set_time = remote_set_time, |
293 | .set_mmss = remote_set_mmss, | 293 | .set_mmss64 = remote_set_mmss, |
294 | .ioctl = alpha_rtc_ioctl, | 294 | .ioctl = alpha_rtc_ioctl, |
295 | }; | 295 | }; |
296 | #endif | 296 | #endif |