iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time: Introduce new GENERIC_TIME_VSYSCALL

Browse Source 
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 <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>
This commit is contained in:
John Stultz 2012-09-11 19:58:13 -04:00
parent 7063942116
commit 576094b7f0
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/linux/timekeeper_internal.h
View File

@ -66,16 +66,38 @@ struct timekeeper {
seqlock_t lock; seqlock_t lock;
}; };
static inline struct timespec tk_xtime(struct timekeeper *tk)
{
struct timespec ts;
#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD ts.tv_sec = tk->xtime_sec;
extern void ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
update_vsyscall_old(struct timespec *ts, struct timespec *wtm, return ts;
}
#ifdef CONFIG_GENERIC_TIME_VSYSCALL
extern void update_vsyscall(struct timekeeper *tk);
extern void update_vsyscall_tz(void);
#elif defined(CONFIG_GENERIC_TIME_VSYSCALL_OLD)
extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
struct clocksource *c, u32 mult); struct clocksource *c, u32 mult);
extern void update_vsyscall_tz(void); 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 #else
static inline void
update_vsyscall_old(struct timespec *ts, struct timespec *wtm, static inline void update_vsyscall(struct timekeeper *tk)
struct clocksource *c, u32 mult)
{ {
} }
static inline void update_vsyscall_tz(void) static inline void update_vsyscall_tz(void)

4
kernel/time/Kconfig
View File

@ -12,6 +12,10 @@ config CLOCKSOURCE_WATCHDOG
config ARCH_CLOCKSOURCE_DATA config ARCH_CLOCKSOURCE_DATA
bool bool
# Timekeeping vsyscall support
config GENERIC_TIME_VSYSCALL
bool
# Timekeeping vsyscall support # Timekeeping vsyscall support
config GENERIC_TIME_VSYSCALL_OLD config GENERIC_TIME_VSYSCALL_OLD
bool bool

14
kernel/time/timekeeping.c
View File

@ -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) static void tk_set_xtime(struct timekeeper *tk, const struct timespec *ts)
{ {
tk->xtime_sec = ts->tv_sec; 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 */ /* must hold write on timekeeper.lock */
static void timekeeping_update(struct timekeeper *tk, bool clearntp) static void timekeeping_update(struct timekeeper *tk, bool clearntp)
{ {
struct timespec xt;
if (clearntp) { if (clearntp) {
tk->ntp_error = 0; tk->ntp_error = 0;
ntp_clear(); ntp_clear();
} }
xt = tk_xtime(tk); update_vsyscall(tk);
update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult);
} }
/** /**