diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 17:56:23 -0700 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 12:40:54 +0200 |
commit | 7615856ebfee52b080c22d263ca4debbd0df0ac1 (patch) | |
tree | beb06e60af7560c28d5bad41f03a5238636e91fc /include/linux/clocksource.h | |
parent | 06d518e3dfb25334282c7e38b4d7a4eada215f6d (diff) | |
download | linux-stable-7615856ebfee52b080c22d263ca4debbd0df0ac1.tar.gz linux-stable-7615856ebfee52b080c22d263ca4debbd0df0ac1.tar.bz2 linux-stable-7615856ebfee52b080c22d263ca4debbd0df0ac1.zip |
timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
update_vsyscall() did not provide the wall_to_monotoinc offset,
so arch specific implementations tend to reference wall_to_monotonic
directly. This limits future cleanups in the timekeeping core, so
this patch fixes the update_vsyscall interface to provide
wall_to_monotonic, allowing wall_to_monotonic to be made static
as planned in Documentation/feature-removal-schedule.txt
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Tony Luck <tony.luck@intel.com>
LKML-Reference: <1279068988-21864-7-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 5ea3c60c160c..21677d99a161 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -313,11 +313,13 @@ 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, u32 mult); +update_vsyscall(struct timespec *ts, struct timespec *wtm, + struct clocksource *c, u32 mult); extern void update_vsyscall_tz(void); #else static inline void -update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult) +update_vsyscall(struct timespec *ts, struct timespec *wtm, + struct clocksource *c, u32 mult) { } |