timer fix
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
HEAD: 7bd36014460f793c19e7d6c94dab67b0afcfcb7f timekeeping: Fix HRTICK related deadlock from ntp lock changes
An NTP related lockup fix.
Thanks,
Ingo
------------------>
John Stultz (1):
timekeeping: Fix HRTICK related deadlock from ntp lock changes
include/linux/timex.h | 1 + kernel/time/ntp.c | 6 ++---- kernel/time/timekeeping.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-)
include/linux/timex.h +1 -0
@@ -141,6 +141,7 @@ extern int do_adjtimex(struct timex *);extern void hardpps (const struct timespec *,const struct timespec *);int read_current_timer (unsigned long *timer_val); +void ntp_notify_cmos_timer (void );/* The clock frequency of the i8253/i8254 PIT */ #define PIT_TICK_RATE 1193182ul
kernel/time/ntp.c +2 -4
@@ -516,13 +516,13 @@ static void sync_cmos_clock(struct work_struct *work) schedule_delayed_work(&sync_cmos_work, timespec_to_jiffies(&next)); } -static void notify_cmos_timer (void ) +void ntp_notify_cmos_timer (void ) {schedule_delayed_work (&sync_cmos_work,0 ); }#else -static inline void notify_cmos_timer (void ) { } +void ntp_notify_cmos_timer (void ) { }#endif
@@ -687,8 +687,6 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai)if (!(time_status &STA_NANO )) txc->time.tv_usec /=NSEC_PER_USEC ; -notify_cmos_timer (); -return result; }
kernel/time/timekeeping.c +2 -0
@@ -1703,6 +1703,8 @@ int do_adjtimex(struct timex *txc)write_seqcount_end (&timekeeper_seq);raw_spin_unlock_irqrestore (&timekeeper_lock, flags); +ntp_notify_cmos_timer (); +return ret; }