diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 12:24:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 12:24:49 -0400 |
| commit | 9d2cd7048b1ec21309e2d1a32bf50732eb5d5de8 (patch) | |
| tree | 0fd13d51002dc3d0991cb5bdd6e026970171d457 /include | |
| parent | 7e28b2712e5ebd8d73d25561585bc2ae77da5c30 (diff) | |
| parent | 7bd36014460f793c19e7d6c94dab67b0afcfcb7f (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/timex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index b3726e61368e..dd3edd7dfc94 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -141,6 +141,7 @@ extern int do_adjtimex(struct timex *); | |||
| 141 | extern void hardpps(const struct timespec *, const struct timespec *); | 141 | extern void hardpps(const struct timespec *, const struct timespec *); |
| 142 | 142 | ||
| 143 | int read_current_timer(unsigned long *timer_val); | 143 | int read_current_timer(unsigned long *timer_val); |
| 144 | void ntp_notify_cmos_timer(void); | ||
| 144 | 145 | ||
| 145 | /* The clock frequency of the i8253/i8254 PIT */ | 146 | /* The clock frequency of the i8253/i8254 PIT */ |
| 146 | #define PIT_TICK_RATE 1193182ul | 147 | #define PIT_TICK_RATE 1193182ul |