diff options
author | Xunlei Pang <pang.xunlei@linaro.org> | 2015-04-01 23:34:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-03 02:18:20 -0400 |
commit | 3c00a1fe8496ff29ab62764bb3f4ce4b48089004 (patch) | |
tree | 1d0ebcd277eb8e7bede0f7e4d8ef26a04285e30b /kernel/time/ntp.c | |
parent | 2ee966320028ac846654eba5344540eeb4dc228d (diff) |
time: Add y2038 safe update_persistent_clock64()
As part of addressing in-kernel y2038 issues, this patch adds
update_persistent_clock64() and replaces all the call sites of
update_persistent_clock() with this function. This is a __weak
implementation, which simply calls the existing y2038 unsafe
update_persistent_clock().
This allows architecture specific implementations to be
converted independently, and eventually y2038-unsafe
update_persistent_clock() can be removed after all its
architecture specific implementations have been converted to
update_persistent_clock64().
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1427945681-29972-4-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r-- | kernel/time/ntp.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 9ad60d028508..7a681003001c 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
@@ -458,6 +458,16 @@ out: | |||
458 | return leap; | 458 | return leap; |
459 | } | 459 | } |
460 | 460 | ||
461 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | ||
462 | int __weak update_persistent_clock64(struct timespec64 now64) | ||
463 | { | ||
464 | struct timespec now; | ||
465 | |||
466 | now = timespec64_to_timespec(now64); | ||
467 | return update_persistent_clock(now); | ||
468 | } | ||
469 | #endif | ||
470 | |||
461 | #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) | 471 | #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) |
462 | static void sync_cmos_clock(struct work_struct *work); | 472 | static void sync_cmos_clock(struct work_struct *work); |
463 | 473 | ||
@@ -493,8 +503,9 @@ static void sync_cmos_clock(struct work_struct *work) | |||
493 | if (persistent_clock_is_local) | 503 | if (persistent_clock_is_local) |
494 | adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); | 504 | adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); |
495 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | 505 | #ifdef CONFIG_GENERIC_CMOS_UPDATE |
496 | fail = update_persistent_clock(timespec64_to_timespec(adjust)); | 506 | fail = update_persistent_clock64(adjust); |
497 | #endif | 507 | #endif |
508 | |||
498 | #ifdef CONFIG_RTC_SYSTOHC | 509 | #ifdef CONFIG_RTC_SYSTOHC |
499 | if (fail == -ENODEV) | 510 | if (fail == -ENODEV) |
500 | fail = rtc_set_ntp_time(adjust); | 511 | fail = rtc_set_ntp_time(adjust); |