diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 19:28:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 19:28:09 -0800 |
| commit | fbf07eac7bf21c262143194181bd97c5d18b8ceb (patch) | |
| tree | c9228b7d272f1e39472da28032605ecd1860e688 /include/linux/clocksource.h | |
| parent | 60d8ce2cd6c283132928c11f3fd57ff4187287e0 (diff) | |
| parent | 8629ea2eaba8ca0de2e38ce1b4a825e16255976e (diff) | |
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Fix /proc/timer_list regression
itimers: Fix racy writes to cpu_itimer fields
timekeeping: Fix clock_gettime vsyscall time warp
Diffstat (limited to 'include/linux/clocksource.h')
| -rw-r--r-- | include/linux/clocksource.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 279c5478e8a..8a4a130cc19 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -292,10 +292,12 @@ clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec) } #ifdef CONFIG_GENERIC_TIME_VSYSCALL -extern void update_vsyscall(struct timespec *ts, struct clocksource *c); +extern void +update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult); extern void update_vsyscall_tz(void); #else -static inline void update_vsyscall(struct timespec *ts, struct clocksource *c) +static inline void +update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult) { } |