time: Introduce new GENERIC_TIME_VSYSCALL

johnstultz-work · johnstultz-work · commit 576094b7f0aa · 2012-09-24T12:38:08.000-04:00
Now that we moved everyone over to GENERIC_TIME_VSYSCALL_OLD,
introduce the new declaration and config option for the new
update_vsyscall method.

Cc: Tony Luck &lt;tony.luck@intel.com&gt;
Cc: Paul Mackerras &lt;paulus@samba.org&gt;
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
Cc: Andy Lutomirski &lt;luto@amacapital.net&gt;
Cc: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
Cc: Paul Turner &lt;pjt@google.com&gt;
Cc: Steven Rostedt &lt;rostedt@goodmis.org&gt;
Cc: Richard Cochran &lt;richardcochran@gmail.com&gt;
Cc: Prarit Bhargava &lt;prarit@redhat.com&gt;
Cc: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Signed-off-by: John Stultz &lt;john.stultz@linaro.org&gt;
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
@@ -66,16 +66,38 @@ struct timekeeper {
 	seqlock_t		lock;
 };
 
+static inline struct timespec tk_xtime(struct timekeeper *tk)
+{
+	struct timespec ts;
+
+	ts.tv_sec = tk->xtime_sec;
+	ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
+	return ts;
+}
+
+
+#ifdef CONFIG_GENERIC_TIME_VSYSCALL
+
+extern void update_vsyscall(struct timekeeper *tk);
+extern void update_vsyscall_tz(void);
 
-#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
-extern void
-update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
-			struct clocksource *c, u32 mult);
+#elif defined(CONFIG_GENERIC_TIME_VSYSCALL_OLD)
+
+extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
+				struct clocksource *c, u32 mult);
 extern void update_vsyscall_tz(void);
+
+static inline void update_vsyscall(struct timekeeper *tk)
+{
+	struct timespec xt;
+
+	xt = tk_xtime(tk);
+	update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
+}
+
 #else
-static inline void
-update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
-					struct clocksource *c, u32 mult)
+
+static inline void update_vsyscall(struct timekeeper *tk)
 {
 }
 static inline void update_vsyscall_tz(void)
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
@@ -12,6 +12,10 @@ config CLOCKSOURCE_WATCHDOG
 config ARCH_CLOCKSOURCE_DATA
 	bool
 
+# Timekeeping vsyscall support
+config GENERIC_TIME_VSYSCALL
+	bool
+
 # Timekeeping vsyscall support
 config GENERIC_TIME_VSYSCALL_OLD
 	bool
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
@@ -42,15 +42,6 @@ static inline void tk_normalize_xtime(struct timekeeper *tk)
 	}
 }
 
-static struct timespec tk_xtime(struct timekeeper *tk)
-{
-	struct timespec ts;
-
-	ts.tv_sec = tk->xtime_sec;
-	ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
-	return ts;
-}
-
 static void tk_set_xtime(struct timekeeper *tk, const struct timespec *ts)
 {
 	tk->xtime_sec = ts->tv_sec;
@@ -192,14 +183,11 @@ static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk)
 /* must hold write on timekeeper.lock */
 static void timekeeping_update(struct timekeeper *tk, bool clearntp)
 {
-	struct timespec xt;
-
 	if (clearntp) {
 		tk->ntp_error = 0;
 		ntp_clear();
 	}
-	xt = tk_xtime(tk);
-	update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
+	update_vsyscall(tk);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,6 @@ static inline void tk_normalize_xtime(struct timekeeper *tk)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-static struct timespec tk_xtime(struct timekeeper *tk)`
`46`		`-{`
`47`		`- struct timespec ts;`
`48`		`-`
`49`		`- ts.tv_sec = tk->xtime_sec;`
`50`		`- ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);`
`51`		`- return ts;`
`52`		`-}`
`53`		`-`
`54`	`45`	`static void tk_set_xtime(struct timekeeper tk, const struct timespec ts)`
`55`	`46`	`{`
`56`	`47`	`tk->xtime_sec = ts->tv_sec;`
`@@ -192,14 +183,11 @@ static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk)`
`192`	`183`	`/* must hold write on timekeeper.lock */`
`193`	`184`	`static void timekeeping_update(struct timekeeper *tk, bool clearntp)`
`194`	`185`	`{`
`195`		`- struct timespec xt;`
`196`		`-`
`197`	`186`	`if (clearntp) {`
`198`	`187`	`tk->ntp_error = 0;`
`199`	`188`	`ntp_clear();`
`200`	`189`	`}`
`201`		`- xt = tk_xtime(tk);`
`202`		`- update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);`
	`190`	`+ update_vsyscall(tk);`
`203`	`191`	`}`
`204`	`192`
`205`	`193`	`/**`