diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-03 01:52:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-03 01:52:21 -0400 |
commit | 6c09f6d830d03b78717403e7b42838a2ee2987ae (patch) | |
tree | 6436ab6a237578406e004c891e134afd266fb95d /kernel/time | |
parent | 389e067032fbb96e439abafae848dd447e4cafb4 (diff) | |
parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) |
Merge tag 'v3.12-rc3' into timers/core
Merge Linux 3.12-rc3 - refresh the tree with the latest fixes before merging new bits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/ntp.c | 6 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index ab1fa7cb8912..af8d1d4f3d55 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
@@ -517,13 +517,13 @@ static void sync_cmos_clock(struct work_struct *work) | |||
517 | schedule_delayed_work(&sync_cmos_work, timespec_to_jiffies(&next)); | 517 | schedule_delayed_work(&sync_cmos_work, timespec_to_jiffies(&next)); |
518 | } | 518 | } |
519 | 519 | ||
520 | static void notify_cmos_timer(void) | 520 | void ntp_notify_cmos_timer(void) |
521 | { | 521 | { |
522 | schedule_delayed_work(&sync_cmos_work, 0); | 522 | schedule_delayed_work(&sync_cmos_work, 0); |
523 | } | 523 | } |
524 | 524 | ||
525 | #else | 525 | #else |
526 | static inline void notify_cmos_timer(void) { } | 526 | void ntp_notify_cmos_timer(void) { } |
527 | #endif | 527 | #endif |
528 | 528 | ||
529 | 529 | ||
@@ -688,8 +688,6 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai) | |||
688 | if (!(time_status & STA_NANO)) | 688 | if (!(time_status & STA_NANO)) |
689 | txc->time.tv_usec /= NSEC_PER_USEC; | 689 | txc->time.tv_usec /= NSEC_PER_USEC; |
690 | 690 | ||
691 | notify_cmos_timer(); | ||
692 | |||
693 | return result; | 691 | return result; |
694 | } | 692 | } |
695 | 693 | ||
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 48b9fffabdc2..947ba25a95a0 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -1703,6 +1703,8 @@ int do_adjtimex(struct timex *txc) | |||
1703 | write_seqcount_end(&timekeeper_seq); | 1703 | write_seqcount_end(&timekeeper_seq); |
1704 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); | 1704 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |
1705 | 1705 | ||
1706 | ntp_notify_cmos_timer(); | ||
1707 | |||
1706 | return ret; | 1708 | return ret; |
1707 | } | 1709 | } |
1708 | 1710 | ||