diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-09-04 23:27:48 +0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-09-24 20:38:06 +0400 |
| commit | 189374aed657e2228ad6b39ece438c9cdafc8dae (patch) | |
| tree | 7bda0a144ede36f98da381b516c7d8956b142651 /include | |
| parent | d7b4202e0581683f1a14fe598633da0067f5241e (diff) | |
| download | linux-189374aed657e2228ad6b39ece438c9cdafc8dae.tar.xz | |
time: Move update_vsyscall definitions to timekeeper_internal.h
Since users will need to include timekeeper_internal.h, move
update_vsyscall definitions to timekeeper_internal.h.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Turner <pjt@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clocksource.h | 16 | ||||
| -rw-r--r-- | include/linux/timekeeper_internal.h | 17 |
2 files changed, 17 insertions, 16 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index fbe89e17124e..4dceaf8ae152 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -319,22 +319,6 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) __clocksource_updatefreq_scale(cs, 1000, khz); } -#ifdef CONFIG_GENERIC_TIME_VSYSCALL -extern void -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 timespec *wtm, - struct clocksource *c, u32 mult) -{ -} - -static inline void update_vsyscall_tz(void) -{ -} -#endif extern void timekeeping_notify(struct clocksource *clock); diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 8ba43fa8c7e6..9c1c2cf413a6 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -65,4 +65,21 @@ struct timekeeper { /* Seqlock for all timekeeper values */ seqlock_t lock; }; + + +#ifdef CONFIG_GENERIC_TIME_VSYSCALL +extern void +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 timespec *wtm, + struct clocksource *c, u32 mult) +{ +} +static inline void update_vsyscall_tz(void) +{ +} +#endif + #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ |