aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/timekeeper_internal.h
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-09-04 15:34:21 -0400
committerJohn Stultz <john.stultz@linaro.org>2012-09-24 12:38:07 -0400
commit706394211648117762edfaeffd6fc04bf3b1a75d (patch)
tree9ce33be0d144430c4089656a9e20c74d829d4638 /include/linux/timekeeper_internal.h
parent189374aed657e2228ad6b39ece438c9cdafc8dae (diff)
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
To help migrate archtectures over to the new update_vsyscall method, redfine CONFIG_GENERIC_TIME_VSYSCALL as CONFIG_GENERIC_TIME_VSYSCALL_OLD 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/linux/timekeeper_internal.h')
-rw-r--r--include/linux/timekeeper_internal.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 9c1c2cf413a6..a904d76a5faa 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -67,13 +67,14 @@ struct timekeeper {
67}; 67};
68 68
69 69
70#ifdef CONFIG_GENERIC_TIME_VSYSCALL 70#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
71extern void 71extern void
72update_vsyscall(struct timespec *ts, struct timespec *wtm, 72update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
73 struct clocksource *c, u32 mult); 73 struct clocksource *c, u32 mult);
74extern void update_vsyscall_tz(void); 74extern void update_vsyscall_tz(void);
75#else 75#else
76static inline void update_vsyscall(struct timespec *ts, struct timespec *wtm, 76static inline void
77update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
77 struct clocksource *c, u32 mult) 78 struct clocksource *c, u32 mult)
78{ 79{
79} 80}