Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+22 -21
+1 -1
arch/ia64/kernel/time.c
··· 19 19 #include <linux/interrupt.h> 20 20 #include <linux/efi.h> 21 21 #include <linux/timex.h> 22 - #include <linux/clocksource.h> 22 + #include <linux/timekeeper_internal.h> 23 23 #include <linux/platform_device.h> 24 24 25 25 #include <asm/machvec.h>
+1 -1
arch/powerpc/kernel/time.c
··· 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 = {
+1 -1
arch/s390/kernel/time.c
··· 34 34 #include <linux/profile.h> 35 35 #include <linux/timex.h> 36 36 #include <linux/notifier.h> 37 - #include <linux/clocksource.h> 37 + #include <linux/timekeeper_internal.h> 38 38 #include <linux/clockchips.h> 39 39 #include <linux/gfp.h> 40 40 #include <linux/kprobes.h>
+1 -1
arch/x86/kernel/vsyscall_64.c
··· 28 28 #include <linux/jiffies.h> 29 29 #include <linux/sysctl.h> 30 30 #include <linux/topology.h> 31 - #include <linux/clocksource.h> 31 + #include <linux/timekeeper_internal.h> 32 32 #include <linux/getcpu.h> 33 33 #include <linux/cpu.h> 34 34 #include <linux/smp.h>
-16
include/linux/clocksource.h
··· 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
+17
include/linux/timekeeper_internal.h
··· 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 */
+1 -1
kernel/time.c
··· 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>