Showing the changes to kernel/time (1 of 3 files). Show all
Unified · Split
| @@ -511,13 +511,17 @@ static void sync_cmos_clock(struct work_struct *work) · 510 unmodified lines | ||
| 511 | 511 | |
| 512 | 512 | getnstimeofday(&now); |
| 513 | 513 | if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2) { |
| 514 | + struct timespec adjust = now; | |
| 515 | + | |
| 514 | 516 | fail = -ENODEV; |
| 517 | + if (persistent_clock_is_local) | |
| 518 | + adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); | |
| 515 | 519 | #ifdef CONFIG_GENERIC_CMOS_UPDATE |
| 516 | − fail = update_persistent_clock(now); | |
| 520 | + fail = update_persistent_clock(adjust); | |
| 517 | 521 | #endif |
| 518 | 522 | #ifdef CONFIG_RTC_SYSTOHC |
| 519 | 523 | if (fail == -ENODEV) |
| 520 | − fail = rtc_set_ntp_time(now); | |
| 524 | + fail = rtc_set_ntp_time(adjust); | |
| 521 | 525 | #endif |
| 522 | 526 | } |
| 523 | 527 | |