diff options
Diffstat (limited to 'kernel/time/ntp.c')
| -rw-r--r-- | kernel/time/ntp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 0f60b08a4f07..7a681003001c 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 19 | 19 | ||
| 20 | #include "tick-internal.h" | ||
| 21 | #include "ntp_internal.h" | 20 | #include "ntp_internal.h" |
| 22 | 21 | ||
| 23 | /* | 22 | /* |
| @@ -459,6 +458,16 @@ out: | |||
| 459 | return leap; | 458 | return leap; |
| 460 | } | 459 | } |
| 461 | 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 | |||
| 462 | #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) | 471 | #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) |
| 463 | static void sync_cmos_clock(struct work_struct *work); | 472 | static void sync_cmos_clock(struct work_struct *work); |
| 464 | 473 | ||
| @@ -494,8 +503,9 @@ static void sync_cmos_clock(struct work_struct *work) | |||
| 494 | if (persistent_clock_is_local) | 503 | if (persistent_clock_is_local) |
| 495 | adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); | 504 | adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); |
| 496 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | 505 | #ifdef CONFIG_GENERIC_CMOS_UPDATE |
| 497 | fail = update_persistent_clock(timespec64_to_timespec(adjust)); | 506 | fail = update_persistent_clock64(adjust); |
| 498 | #endif | 507 | #endif |
| 508 | |||
| 499 | #ifdef CONFIG_RTC_SYSTOHC | 509 | #ifdef CONFIG_RTC_SYSTOHC |
| 500 | if (fail == -ENODEV) | 510 | if (fail == -ENODEV) |
| 501 | fail = rtc_set_ntp_time(adjust); | 511 | fail = rtc_set_ntp_time(adjust); |
