Commit 189374aed657e2228ad6b39ece438c9cdafc8dae
1 parent
d7b4202e05
Exists in
master
and in
20 other branches
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>
Showing 7 changed files with 22 additions and 21 deletions Side-by-side Diff
arch/ia64/kernel/time.c
arch/powerpc/kernel/time.c
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 | /* powerpc clocksource/clockevent code */ |
| 74 | 74 | |
| 75 | 75 | #include <linux/clockchips.h> |
| 76 | -#include <linux/clocksource.h> | |
| 76 | +#include <linux/timekeeper_internal.h> | |
| 77 | 77 | |
| 78 | 78 | static cycle_t rtc_read(struct clocksource *); |
| 79 | 79 | static struct clocksource clocksource_rtc = { |
arch/s390/kernel/time.c
arch/x86/kernel/vsyscall_64.c
include/linux/clocksource.h
| ... | ... | @@ -319,22 +319,6 @@ |
| 319 | 319 | __clocksource_updatefreq_scale(cs, 1000, khz); |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | -#ifdef CONFIG_GENERIC_TIME_VSYSCALL | |
| 323 | -extern void | |
| 324 | -update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 325 | - struct clocksource *c, u32 mult); | |
| 326 | -extern void update_vsyscall_tz(void); | |
| 327 | -#else | |
| 328 | -static inline void | |
| 329 | -update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 330 | - struct clocksource *c, u32 mult) | |
| 331 | -{ | |
| 332 | -} | |
| 333 | - | |
| 334 | -static inline void update_vsyscall_tz(void) | |
| 335 | -{ | |
| 336 | -} | |
| 337 | -#endif | |
| 338 | 322 | |
| 339 | 323 | extern void timekeeping_notify(struct clocksource *clock); |
| 340 | 324 |
include/linux/timekeeper_internal.h
| ... | ... | @@ -65,5 +65,22 @@ |
| 65 | 65 | /* Seqlock for all timekeeper values */ |
| 66 | 66 | seqlock_t lock; |
| 67 | 67 | }; |
| 68 | + | |
| 69 | + | |
| 70 | +#ifdef CONFIG_GENERIC_TIME_VSYSCALL | |
| 71 | +extern void | |
| 72 | +update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 73 | + struct clocksource *c, u32 mult); | |
| 74 | +extern void update_vsyscall_tz(void); | |
| 75 | +#else | |
| 76 | +static inline void update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 77 | + struct clocksource *c, u32 mult) | |
| 78 | +{ | |
| 79 | +} | |
| 80 | +static inline void update_vsyscall_tz(void) | |
| 81 | +{ | |
| 82 | +} | |
| 83 | +#endif | |
| 84 | + | |
| 68 | 85 | #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ |
kernel/time.c
| ... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 | #include <linux/export.h> |
| 31 | 31 | #include <linux/timex.h> |
| 32 | 32 | #include <linux/capability.h> |
| 33 | -#include <linux/clocksource.h> | |
| 33 | +#include <linux/timekeeper_internal.h> | |
| 34 | 34 | #include <linux/errno.h> |
| 35 | 35 | #include <linux/syscalls.h> |
| 36 | 36 | #include <linux/security.h> |