tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
"An NTP related lockup fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Fix HRTICK related deadlock from ntp lock changes

Linus Torvalds 9d2cd704 7e28b271

+5 -4
+1
include/linux/timex.h
··· 141 141 extern void hardpps(const struct timespec *, const struct timespec *); 142 142 143 143 int read_current_timer(unsigned long *timer_val); 144 + void ntp_notify_cmos_timer(void); 144 145 145 146 /* The clock frequency of the i8253/i8254 PIT */ 146 147 #define PIT_TICK_RATE 1193182ul
+2 -4
kernel/time/ntp.c
··· 516 516 schedule_delayed_work(&sync_cmos_work, timespec_to_jiffies(&next)); 517 517 } 518 518 519 - static void notify_cmos_timer(void) 519 + void ntp_notify_cmos_timer(void) 520 520 { 521 521 schedule_delayed_work(&sync_cmos_work, 0); 522 522 } 523 523 524 524 #else 525 - static inline void notify_cmos_timer(void) { } 525 + void ntp_notify_cmos_timer(void) { } 526 526 #endif 527 527 528 528 ··· 686 686 txc->time.tv_usec = ts->tv_nsec; 687 687 if (!(time_status & STA_NANO)) 688 688 txc->time.tv_usec /= NSEC_PER_USEC; 689 - 690 - notify_cmos_timer(); 691 689 692 690 return result; 693 691 }
+2
kernel/time/timekeeping.c
··· 1703 1703 write_seqcount_end(&timekeeper_seq); 1704 1704 raw_spin_unlock_irqrestore(&timekeeper_lock, flags); 1705 1705 1706 + ntp_notify_cmos_timer(); 1707 + 1706 1708 return ret; 1707 1709 } 1708 1710